Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2015-06-30 18:54:11 +02:00
commit 7902ab3fab

View File

@ -355,8 +355,6 @@ $(document).ready(function () {
function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */ function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
if ($pageType!=null && strcasecmp($pageType, "noNav")) { if ($pageType!=null && strcasecmp($pageType, "noNav")) {
if($pageType == "view_folder" || $pageType == "view_document")
echo $pageTitle."\n";
echo "<div class=\"navbar\">\n"; echo "<div class=\"navbar\">\n";
echo " <div class=\"navbar-inner\">\n"; echo " <div class=\"navbar-inner\">\n";
echo " <div class=\"container\">\n"; echo " <div class=\"container\">\n";
@ -388,6 +386,8 @@ $(document).ready(function () {
echo " </div>\n"; echo " </div>\n";
echo " </div>\n"; echo " </div>\n";
echo "</div>\n"; echo "</div>\n";
if($pageType == "view_folder" || $pageType == "view_document")
echo $pageTitle."\n";
} else { } else {
echo "<legend>".$pageTitle."</legend>\n"; echo "<legend>".$pageTitle."</legend>\n";
} }