From f2bdd00f1c3f8b2d8e4e7d85986c053763456e87 Mon Sep 17 00:00:00 2001
From: Claas Kazzer <kazzer@uni-leipzig.de>
Date: Tue, 15 Sep 2015 09:32:36 +0200
Subject: [PATCH] refs #5719: cherry-picked revisions b19aa219, 7a119302
Conflicts:
themes/foundation5/js/record.js
---
themes/foundation5/js/vudl/record.js | 4 ++--
themes/foundation5/templates/record/view.phtml | 2 +-
themes/foundation5/templates/vudl/views/audio.phtml | 2 +-
themes/foundation5/templates/vudl/views/download.phtml | 2 +-
themes/foundation5/templates/vudl/views/video.phtml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/themes/foundation5/js/vudl/record.js b/themes/foundation5/js/vudl/record.js
index 9876f328912..6e0a15a2811 100644
--- a/themes/foundation5/js/vudl/record.js
+++ b/themes/foundation5/js/vudl/record.js
@@ -24,7 +24,7 @@ function ajaxGetView(pageObject) {
if(tab.length > 0) {
tab.click();
} else {
- currentTab = $('.nav-tabs li a:eq(0)')[0].id;
+ currentTab = $('.tabs li a:eq(0)')[0].id;
}
},
error: function(d,e){
@@ -134,7 +134,7 @@ function scrollToSelected() {
// Toggle side menu
function toggleSideNav() {
$('#side-nav').toggle();
- var opener = $('#view .nav-tabs li.opener a');
+ var opener = $('#view .tabs li.opener a');
opener.toggleClass('hidden');
$('#view').toggleClass('col-sm-9').toggleClass('col-sm-12');
}
diff --git a/themes/foundation5/templates/record/view.phtml b/themes/foundation5/templates/record/view.phtml
index fcb43fadf55..3dca321a55c 100644
--- a/themes/foundation5/templates/record/view.phtml
+++ b/themes/foundation5/templates/record/view.phtml
@@ -65,7 +65,7 @@
if (!$obj->isVisible()) { $tab_classes[] = 'hide'; }
if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
?>
- <li class="tab-title<?=count($tab_classes) > 0 ? ' ' . implode(' ', $tab_classes) . '' : ''?>">
+ <li class="tab-title <?=count($tab_classes) > 0 ? ' ' . implode(' ', $tab_classes) . '' : ''?>">
<a id="<?=strtolower($tab) ?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>"><?=$this->transEsc($desc)?></a>
</li>
<? endforeach; ?>
diff --git a/themes/foundation5/templates/vudl/views/audio.phtml b/themes/foundation5/templates/vudl/views/audio.phtml
index 6f84702747a..ab1f722eebd 100644
--- a/themes/foundation5/templates/vudl/views/audio.phtml
+++ b/themes/foundation5/templates/vudl/views/audio.phtml
@@ -16,7 +16,7 @@
};
$(document).ready(function() {
currentTab = "master-tab";
- $('#view .nav-tabs li.opener a').addClass('hide');
+ $('#view .tabs li.opener a').addClass('hide');
});
</script>
<dl class="tabs" data-tab>
diff --git a/themes/foundation5/templates/vudl/views/download.phtml b/themes/foundation5/templates/vudl/views/download.phtml
index f903753360c..1850bc0276e 100644
--- a/themes/foundation5/templates/vudl/views/download.phtml
+++ b/themes/foundation5/templates/vudl/views/download.phtml
@@ -6,7 +6,7 @@
};
$(document).ready(function() {
currentTab = "master-tab";
- $('#view .nav-tabs li.opener a').addClass('hide');
+ $('#view .tabs li.opener a').addClass('hide');
});
</script>
<dl class="tabs" data-tab>
diff --git a/themes/foundation5/templates/vudl/views/video.phtml b/themes/foundation5/templates/vudl/views/video.phtml
index 1d67aaf3ca9..2b1eb33c84f 100644
--- a/themes/foundation5/templates/vudl/views/video.phtml
+++ b/themes/foundation5/templates/vudl/views/video.phtml
@@ -16,7 +16,7 @@
};
$(document).ready(function() {
currentTab = "master-tab";
- $('#view .nav-tabs li.opener a').addClass('hide');
+ $('#view .tabs li.opener a').addClass('hide');
});
</script>
<dl class="tabs" data-tab>
--
GitLab