Commit 12b629a2 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Fehler behoben bei dem der Link für die Settingsseite nicht richtig generiert wurde

parent 715ef1ac
This diff is collapsed.
...@@ -3587,13 +3587,13 @@ $(document).ready(function() { ...@@ -3587,13 +3587,13 @@ $(document).ready(function() {
function tabs() { function tabs() {
//return; //return;
$("#foki a").each(function() { $("#foki > li.tab-selector > a").each(function() {
$(this).attr("href", "#" + $(this).attr("aria-controls")); $(this).attr("href", "#" + $(this).attr("aria-controls"));
$(this).attr("role", "tab"); $(this).attr("role", "tab");
$(this).attr("data-toggle", "tab"); $(this).attr("data-toggle", "tab");
}); });
$("#foki a").off(); $("#foki > li.tab-selector > a").off();
$("#foki a").on("show.bs.tab", function(e) { $("#foki > li.tab-selector > a").on("show.bs.tab", function(e) {
var fokus = $(this).attr("aria-controls"); var fokus = $(this).attr("aria-controls");
var link = $("#" + fokus + "TabSelector a").attr("data-href"); var link = $("#" + fokus + "TabSelector a").attr("data-href");
if ($("#" + fokus + "TabSelector").attr("data-loaded") != "1") { if ($("#" + fokus + "TabSelector").attr("data-loaded") != "1") {
......
This diff is collapsed.
...@@ -7,13 +7,13 @@ $(document).ready(function() { ...@@ -7,13 +7,13 @@ $(document).ready(function() {
function tabs() { function tabs() {
//return; //return;
$("#foki a").each(function() { $("#foki > li.tab-selector > a").each(function() {
$(this).attr("href", "#" + $(this).attr("aria-controls")); $(this).attr("href", "#" + $(this).attr("aria-controls"));
$(this).attr("role", "tab"); $(this).attr("role", "tab");
$(this).attr("data-toggle", "tab"); $(this).attr("data-toggle", "tab");
}); });
$("#foki a").off(); $("#foki > li.tab-selector > a").off();
$("#foki a").on("show.bs.tab", function(e) { $("#foki > li.tab-selector > a").on("show.bs.tab", function(e) {
var fokus = $(this).attr("aria-controls"); var fokus = $(this).attr("aria-controls");
var link = $("#" + fokus + "TabSelector a").attr("data-href"); var link = $("#" + fokus + "TabSelector a").attr("data-href");
if ($("#" + fokus + "TabSelector").attr("data-loaded") != "1") { if ($("#" + fokus + "TabSelector").attr("data-loaded") != "1") {
......
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
@endif @endif
<ul class="nav nav-tabs" id="foki" role="tablist"> <ul class="nav nav-tabs" id="foki" role="tablist">
@if( $metager->getFokus() === "web" ) @if( $metager->getFokus() === "web" )
<li id="webTabSelector" role="presentation" data-loaded="1" class="active"> <li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="web" data-href="#web" href="#web"> <a aria-controls="web" data-href="#web" href="#web">
<span class='glyphicon glyphicon-globe'></span> <span class='glyphicon glyphicon-globe'></span>
<span class="hidden-xs">{{ trans('index.foki.web') }}</span> <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
</a> </a>
</li> </li>
@else @else
<li data-loaded="0" id="webTabSelector" role="presentation"> <li data-loaded="0" id="webTabSelector" class="tab-selector" role="presentation">
<a aria-controls="web" data-href="{{ $metager->generateSearchLink('web') }}" href="{{ $metager->generateSearchLink('web') }}"> <a aria-controls="web" data-href="{{ $metager->generateSearchLink('web') }}" href="{{ $metager->generateSearchLink('web') }}">
<span class='glyphicon glyphicon-globe'></span> <span class='glyphicon glyphicon-globe'></span>
<span class="hidden-xs">{{ trans('index.foki.web') }}</span> <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
...@@ -59,14 +59,14 @@ ...@@ -59,14 +59,14 @@
@endif @endif
@if( $metager->getFokus() === "bilder" ) @if( $metager->getFokus() === "bilder" )
<li id="bilderTabSelector" role="presentation" data-loaded="1" class="active"> <li id="bilderTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="bilder" data-href="#bilder" href="#bilder"> <a aria-controls="bilder" data-href="#bilder" href="#bilder">
<span class='glyphicon glyphicon-picture'></span> <span class='glyphicon glyphicon-picture'></span>
<span class="hidden-xs">{{ trans('index.foki.bilder') }}</span> <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
</a> </a>
</li> </li>
@else @else
<li data-loaded="0" id="bilderTabSelector" role="presentation"> <li data-loaded="0" id="bilderTabSelector" class="tab-selector" role="presentation">
<a aria-controls="bilder" data-href="{{ $metager->generateSearchLink('bilder') }}" href="{{ $metager->generateSearchLink('bilder') }}"> <a aria-controls="bilder" data-href="{{ $metager->generateSearchLink('bilder') }}" href="{{ $metager->generateSearchLink('bilder') }}">
<span class='glyphicon glyphicon-picture'></span> <span class='glyphicon glyphicon-picture'></span>
<span class="hidden-xs">{{ trans('index.foki.bilder') }}</span> <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
...@@ -75,14 +75,14 @@ ...@@ -75,14 +75,14 @@
@endif @endif
@if( $metager->getFokus() === "nachrichten" ) @if( $metager->getFokus() === "nachrichten" )
<li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active"> <li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten"> <a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten">
<span class='glyphicon glyphicon-bullhorn'></span> <span class='glyphicon glyphicon-bullhorn'></span>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span> <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a> </a>
</li> </li>
@else @else
<li data-loaded="0" id="nachrichtenTabSelector" role="presentation" > <li data-loaded="0" id="nachrichtenTabSelector" class="tab-selector" role="presentation" >
<a aria-controls="nachrichten" data-href="{{ $metager->generateSearchLink('nachrichten') }}" href="{{ $metager->generateSearchLink('nachrichten') }}"> <a aria-controls="nachrichten" data-href="{{ $metager->generateSearchLink('nachrichten') }}" href="{{ $metager->generateSearchLink('nachrichten') }}">
<span class='glyphicon glyphicon-bullhorn'></span> <span class='glyphicon glyphicon-bullhorn'></span>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span> <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
...@@ -91,14 +91,14 @@ ...@@ -91,14 +91,14 @@
@endif @endif
@if( $metager->getFokus() === "wissenschaft" ) @if( $metager->getFokus() === "wissenschaft" )
<li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active"> <li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft"> <a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft">
<span class='glyphicon glyphicon-file'></span> <span class='glyphicon glyphicon-file'></span>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span> <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a> </a>
</li> </li>
@else @else
<li data-loaded="0" id="wissenschaftTabSelector" role="presentation"> <li data-loaded="0" id="wissenschaftTabSelector" class="tab-selector" role="presentation">
<a aria-controls="wissenschaft" data-href="{{ $metager->generateSearchLink('wissenschaft') }}" href="{{ $metager->generateSearchLink('wissenschaft') }}"> <a aria-controls="wissenschaft" data-href="{{ $metager->generateSearchLink('wissenschaft') }}" href="{{ $metager->generateSearchLink('wissenschaft') }}">
<span class='glyphicon glyphicon-file'></span> <span class='glyphicon glyphicon-file'></span>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span> <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
...@@ -107,14 +107,14 @@ ...@@ -107,14 +107,14 @@
@endif @endif
@if( $metager->getFokus() === "produktsuche" ) @if( $metager->getFokus() === "produktsuche" )
<li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active"> <li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche"> <a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
<span class='glyphicon glyphicon-shopping-cart'></span> <span class='glyphicon glyphicon-shopping-cart'></span>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span> <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a> </a>
</li> </li>
@else @else
<li data-loaded="0" id="produktsucheTabSelector" role="presentation" > <li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation" >
<a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}"> <a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}">
<span class='glyphicon glyphicon-shopping-cart'></span> <span class='glyphicon glyphicon-shopping-cart'></span>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span> <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
@endif @endif
@if( $metager->getFokus() === "angepasst" ) @if( $metager->getFokus() === "angepasst" )
<li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active"> <li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="angepasst" data-href="#angepasst" href="#angepasst"> <a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
<span class='glyphicon glyphicon-cog'></span> <span class='glyphicon glyphicon-cog'></span>
<span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span> <span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment