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

inc/inc.ClassUI_Default.php

@@ -80,7 +80,8 @@ class UI_Default {
 	function footNote() { /* {{{ */
 		global $settings;
 		
-		echo '<div class="row-fluid" style="padding-top: 20px;">'."\n";
+		echo "<div class=\"container-fluid\" style=\"margin-top: 0px;\">\n";
+		echo '<div class="row-fluid">'."\n";
 		echo '<div class="span12">'."\n";
 		echo '<div class="alert alert-info">'."\n";
 		if ($settings->_printDisclaimer){
@@ -93,6 +94,7 @@ class UI_Default {
 		echo "</div>\n";
 		echo "</div>\n";
 		echo "</div>\n";
+		echo "</div>\n";
 	
 		return;
 	} /* }}} */
@@ -113,7 +115,7 @@ class UI_Default {
 		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
-		echo "   <a class=\"brand\">".(strlen($settings->_sitename)>0 ? $settings->_sitename : "SeedDMS")."</a>\n";
+		echo "   <a class=\"brand\">".(strlen($settings->_siteName)>0 ? $settings->_siteName : "SeedDMS")."</a>\n";
 		echo "  </div>\n";
 		echo " </div>\n";
 		echo "</div>\n";
@@ -385,7 +387,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function contentContainerStart() { /* {{{ */
+	function contentContainerStart($class="") { /* {{{ */
 
 		echo "<div class=\"well".($class ? " ".$class : "")."\">\n";
 		return;

out/out.Charts.php

@@ -25,6 +25,9 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -42,10 +45,11 @@ switch($type) {
 		}
 		break;
 }
-//print_r($data);
+
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rootfolder'=>$rootfolder, 'type'=>$type, 'data'=>$data));
 if($view) {
+	$view->setParam('rootfolder', $rootfolder);
+	$view->setParam('type', $type);
+	$view->setParam('data', $data);
 	$view($_GET);
 	exit;
 }

out/out.Login.php

@@ -39,9 +39,16 @@ else if (isset($_POST["referuri"]) && strlen($_POST["referuri"])>0) {
 $themes = UI::getStyles();
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('enableguestlogin'=>$settings->_enableGuestLogin, 'enablepasswordforgotten'=>$settings->_enablePasswordForgotten, 'referrer'=>$refer, 'themes'=>$themes, 'languages'=>getLanguages(), 'enablelanguageselector'=>$settings->_enableLanguageSelector, 'enablethemeselector'=>$settings->_enableThemeSelector));
+$view = UI::factory($theme, $tmp[1], array());
 if($view) {
-	$view->show();
+	$view->setParam('enableguestlogin', $settings->_enableGuestLogin);
+	$view->setParam('enablepasswordforgotten', $settings->_enablePasswordForgotten);
+	$view->setParam('referrer', $refer);
+	$view->setParam('themes', $themes);
+	$view->setParam('languages', getLanguages());
+	$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
+	$view->setParam('enablethemeselector', $settings->_enableThemeSelector);
+	$view($_GET);
 	exit;
 }
 

views/bootstrap/class.AddDocument.php

@@ -566,6 +566,7 @@ $(document).ready(function() {
 		</form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 
 	} /* }}} */

views/bootstrap/class.AddEvent.php

@@ -106,6 +106,7 @@ function checkForm()
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.AddFile.php

@@ -125,6 +125,7 @@ $(document).ready( function() {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 
 	} /* }}} */

views/bootstrap/class.AddFile2.php

@@ -48,6 +48,7 @@ class SeedDMS_View_AddFile2 extends SeedDMS_Bootstrap_Style {
 		$this->printUploadApplet('../op/op.AddFile2.php', array('documentid'=>$document->getId()), 1, array('name'=>1, 'comment'=>1));
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.AddMultiDocument.php

@@ -56,18 +56,18 @@ function chooseCategory(form, cats) {
 </script>
 
 <?php
-	$this->contentHeading(getMLText("add_document"));
+		$this->contentHeading(getMLText("add_document"));
-	$this->contentContainerStart();
+		$this->contentContainerStart();
 
-	// Retrieve a list of all users and groups that have review / approve
+		// Retrieve a list of all users and groups that have review / approve
-	// privileges.
+		// privileges.
-	$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
+		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 
-	$this->printUploadApplet('../op/op.AddMultiDocument.php', array('folderid'=>$folder->getId()));
+		$this->printUploadApplet('../op/op.AddMultiDocument.php', array('folderid'=>$folder->getId()));
-
-	$this->contentContainerEnd();
-	$this->htmlEndPage();
 
+		$this->contentContainerEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
 	} /* }}} */
 }
 ?>

views/bootstrap/class.AddSubFolder.php

@@ -110,6 +110,7 @@ function checkForm()
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.AdminTools.php

@@ -95,6 +95,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	</div>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ApprovalSummary.php

@@ -158,8 +158,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
-
 	} /* }}} */
 }
 ?>

views/bootstrap/class.ApproveDocument.php

@@ -207,6 +207,7 @@ function checkGrpForm()
 		}
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.AttributeMgr.php

@@ -316,8 +316,8 @@ $(document).ready( function() {
 </div>
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
-
 	} /* }}} */
 }
 ?>

views/bootstrap/class.BackupTools.php

@@ -187,6 +187,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 		*/
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Bootstrap.php

@@ -166,7 +166,8 @@ $(document).ready(function () {
 	} /* }}} */
 
 	function footNote() { /* {{{ */
-		echo '<div class="row-fluid" style="padding-top: 20px;">'."\n";
+		echo "<div class=\"container-fluid\">\n";
+		echo '<div class="row-fluid">'."\n";
 		echo '<div class="span12">'."\n";
 		echo '<div class="alert alert-info">'."\n";
 		if ($this->params['printdisclaimer']){
@@ -179,6 +180,7 @@ $(document).ready(function () {
 		echo "</div>\n";
 		echo "</div>\n";
 		echo "</div>\n";
+		echo "</div>\n";
 	
 		return;
 	} /* }}} */
@@ -1258,6 +1260,7 @@ $('#clearfilename<?php print $formName ?>').click(function(ev) {
 		print "</div>";
 		print "<div><button class=\"btn\" onclick=\"window.history.back();\">".getMLText('back')."</button></div>";
 		
+		$this->contentEnd();
 		$this->htmlEndPage();
 		
 		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);

views/bootstrap/class.Calendar.php

@@ -358,8 +358,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
-
 	} /* }}} */
 }
 ?>

views/bootstrap/class.Categories.php

@@ -148,6 +148,7 @@ $(document).ready( function() {
 </div>
 	
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ChangePassword.php

@@ -83,6 +83,7 @@ class SeedDMS_View_ChangePassword extends SeedDMS_Bootstrap_Style {
 <script language="JavaScript">document.form1.newpassword.focus();</script>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Charts.php

@@ -201,45 +201,43 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
-?>
+		echo "<div class=\"row-fluid\">\n";
 
-<?php
+		echo "<div class=\"span3\">\n";
-echo "<div class=\"row-fluid\">\n";
+		$this->contentHeading(getMLText("chart_selection"));
+		echo "<div class=\"well\">\n";
+		foreach(array('docsperuser', 'sizeperuser', 'docspermimetype', 'docspercategory', 'docsperstatus', 'docspermonth', 'docsaccumulated') as $atype) {
+			echo "<div><a href=\"?type=".$atype."\">".getMLText('chart_'.$atype.'_title')."</a></div>\n";
+		}
+		echo "</div>\n";
+		echo "</div>\n";
 
-echo "<div class=\"span3\">\n";
+		if(in_array($type, array('docspermonth', 'docsaccumulated'))) {
-$this->contentHeading(getMLText("chart_selection"));
+			echo "<div class=\"span9\">\n";
-echo "<div class=\"well\">\n";
+		} else {
-foreach(array('docsperuser', 'sizeperuser', 'docspermimetype', 'docspercategory', 'docsperstatus', 'docspermonth', 'docsaccumulated') as $atype) {
+			echo "<div class=\"span6\">\n";
-	echo "<div><a href=\"?type=".$atype."\">".getMLText('chart_'.$atype.'_title')."</a></div>\n";
+		}
-}
+		$this->contentHeading(getMLText('chart_'.$type.'_title'));
-echo "</div>\n";
+		echo "<div class=\"well\">\n";
-echo "</div>\n";
-
-if(in_array($type, array('docspermonth', 'docsaccumulated'))) {
-	echo "<div class=\"span9\">\n";
-} else {
-	echo "<div class=\"span6\">\n";
-}
-$this->contentHeading(getMLText('chart_'.$type.'_title'));
-echo "<div class=\"well\">\n";
 ?>
 <div id="chart" style="height: 400px;" class="chart"></div>
 <?php
-echo "</div>\n";
+		echo "</div>\n";
-echo "</div>\n";
+		echo "</div>\n";
 
-if(!in_array($type, array('docspermonth', 'docsaccumulated'))) {
+		if(!in_array($type, array('docspermonth', 'docsaccumulated'))) {
-	echo "<div class=\"span3\">\n";
+			echo "<div class=\"span3\">\n";
-	$this->contentHeading(getMLText('legend'));
+			$this->contentHeading(getMLText('legend'));
-	echo "<div class=\"well\" id=\"legend\">\n";
+			echo "<div class=\"well\" id=\"legend\">\n";
-	echo "</div>\n";
+			echo "</div>\n";
-	echo "</div>\n";
+			echo "</div>\n";
-}
+		}
 
-echo "</div>\n";
+		echo "</div>\n";
 
-$this->contentContainerEnd();
+		$this->contentContainerEnd();
-$this->htmlEndPage();
+		$this->contentEnd();
+		$this->htmlEndPage();
 	} /* }}} */
 }
 ?>

views/bootstrap/class.CreateIndex.php

@@ -43,6 +43,7 @@ class SeedDMS_View_CreateIndex extends SeedDMS_Bootstrap_Style {
 		echo '<a href="out.Indexer.php?create=1&confirm=1" class="btn">'.getMLText('confirm_create_fulltext_index').'</a>';
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.DashBoard.php

@@ -114,7 +114,7 @@ class SeedDMS_View_DashBoard extends SeedDMS_Bootstrap_Style {
 		</div>
 		
 <?
-
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.DefaultKeywords.php

@@ -259,6 +259,7 @@ $(document).ready( function() {
 </div>
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.DocumentAccess.php

@@ -140,6 +140,7 @@ $(document).ready( function() {
 	</p>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 		return;
 }
@@ -292,6 +293,7 @@ $(document).ready( function() {
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.DocumentNotify.php

@@ -164,6 +164,7 @@ $(document).ready( function() {
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.DocumentVersionDetail.php

@@ -346,6 +346,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			</div>
 <?php
 		}
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.EditAttributes.php

@@ -71,6 +71,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.EditComment.php

@@ -93,6 +93,7 @@ function checkForm()
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.EditDocument.php

@@ -178,6 +178,7 @@ $(document).ready( function() {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.EditEvent.php

@@ -113,6 +113,7 @@ function checkForm()
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.EditFolder.php

@@ -124,6 +124,7 @@ function checkForm() {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.EditOnline.php

@@ -116,23 +116,24 @@ $(document).ready(function()	{
 <input type="hidden" name="documentid" value="<?= $document->getId() ?>" />
 <textarea id="markdown" name="data" width="100%" rows="20">
 <?php
-	echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath()));
+		echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath()));
 ?>
 </textarea>
 <button id="update" type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
 </form>
 <?php
-echo "</div>\n";
+		echo "</div>\n";
 
-echo "<div class=\"span6\">\n";
+		echo "<div class=\"span6\">\n";
-$this->contentHeading(getMLText("preview"));
+		$this->contentHeading(getMLText("preview"));
-echo "<div class=\"ajax\" data-view=\"EditOnline\" data-action=\"preview\" data-query=\"documentid=".$document->getId()."\"></div>";
+		echo "<div class=\"ajax\" data-view=\"EditOnline\" data-action=\"preview\" data-query=\"documentid=".$document->getId()."\"></div>";
-echo "</div>\n";
+		echo "</div>\n";
 
-echo "</div>\n";
+		echo "</div>\n";
 
-$this->contentContainerEnd();
+		$this->contentContainerEnd();
-$this->htmlEndPage();
+		$this->contentEnd();
+		$this->htmlEndPage();
 	} /* }}} */
 }
 ?>

views/bootstrap/class.EditUserData.php

@@ -188,6 +188,7 @@ $(document).ready( function() {
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.FolderAccess.php

@@ -131,6 +131,7 @@ function checkForm()
 	</p>
 <?php
 				$this->contentContainerEnd();
+				$this->contentEnd();
 				$this->htmlEndPage();
 				return;
 			}
@@ -277,6 +278,7 @@ function checkForm()
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.FolderNotify.php

@@ -173,6 +173,7 @@ function checkForm()
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ForcePasswordChange.php

@@ -80,6 +80,7 @@ class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style {
 		print "<p>";
 		print implode(' | ', $tmpfoot);
 		print "</p>\n";
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.GroupMgr.php

@@ -296,6 +296,7 @@ $(document).ready( function() {
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.GroupView.php

@@ -98,6 +98,7 @@ class SeedDMS_View_GroupView extends SeedDMS_Bootstrap_Style {
 		echo "</ul>\n";
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Help.php

@@ -50,6 +50,7 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
 			readfile("../languages/".$this->params['session']->getLanguage()."/help.htm");
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ImportFS.php

@@ -71,7 +71,7 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 		print "</form>\n";
 
 		$this->contentContainerEnd();
-
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.IndexInfo.php

@@ -72,6 +72,7 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 //		echo "</pre>";
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Indexer.php

@@ -102,6 +102,7 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
 		$index->commit();
 		$index->optimize();
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Info.php

@@ -59,7 +59,7 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
 //		$this->contentContainerStart();
 //		phpinfo();
 //		$this->contentContainerEnd();
-//		$this->contentEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.LogManagement.php

@@ -149,6 +149,7 @@ $(document).ready( function() {
     </div>
   </div>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 		} elseif(file_exists($this->contentdir.$logname)){
 			echo $logname."<pre>\n";

views/bootstrap/class.Login.php

@@ -31,26 +31,14 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_Login extends SeedDMS_Bootstrap_Style {
 
-	function show() { /* {{{ */
+	function js() { /* {{{ */
-		$enableguestlogin = $this->params['enableguestlogin'];
-		$enablepasswordforgotten = $this->params['enablepasswordforgotten'];
-		$refer = $this->params['referrer'];
-		$themes = $this->params['themes'];
-		$languages = $this->params['languages'];
-		$enableLanguageSelector = $this->params['enablelanguageselector'];
-		$enableThemeSelector = $this->params['enablethemeselector'];
-
-		$this->htmlStartPage(getMLText("sign_in"), "login");
-		$this->globalBanner();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("sign_in"));
 ?>
-<script language="JavaScript">
+document.form1.login.focus();
 function checkForm()
 {
 	msg = new Array()
-	if (document.form1.login.value == "") msg.push("<?php printMLText("js_no_login");?>");
+	if($("#login").val() == "") msg.push("<?php printMLText("js_no_login");?>");
-	if (document.form1.pwd.value == "") msg.push("<?php printMLText("js_no_pwd");?>");
+	if($("#pwd").val() == "") msg.push("<?php printMLText("js_no_pwd");?>");
 	if (msg != "") {
   	noty({
   		text: msg.join('<br />'),
@@ -80,10 +68,35 @@ function guestLogin()
 	}
 	document.location.href = url;
 }
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		ev.preventDefault();
+	});
+	$('body').on('click', '#guestlogin', function(ev){
+		ev.preventDefault();
+		guestLogin();
+	});
+});
+<?php
+	} /* }}} */
 
-</script>
+	function show() { /* {{{ */
+		$enableguestlogin = $this->params['enableguestlogin'];
+		$enablepasswordforgotten = $this->params['enablepasswordforgotten'];
+		$refer = $this->params['referrer'];
+		$themes = $this->params['themes'];
+		$languages = $this->params['languages'];
+		$enableLanguageSelector = $this->params['enablelanguageselector'];
+		$enableThemeSelector = $this->params['enablethemeselector'];
+
+		$this->htmlStartPage(getMLText("sign_in"), "login");
+		$this->globalBanner();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("sign_in"));
+?>
 <?php $this->contentContainerStart(); ?>
-<form class="form-horizontal" action="../op/op.Login.php" method="post" name="form1" onsubmit="return checkForm();">
+<form class="form-horizontal" action="../op/op.Login.php" method="post" name="form1" id="form">
 <?php
 		if ($refer) {
 			echo "<input type='hidden' name='referuri' value='".sanitizeString($refer)."'/>";
@@ -147,7 +160,7 @@ function guestLogin()
 		$this->contentContainerEnd();
 		$tmpfoot = array();
 		if ($enableguestlogin)
-			$tmpfoot[] = "<a href=\"javascript:guestLogin()\">" . getMLText("guest_login") . "</a>\n";
+			$tmpfoot[] = "<a href=\"\" id=\"guestlogin\">" . getMLText("guest_login") . "</a>\n";
 		if ($enablepasswordforgotten)
 			$tmpfoot[] = "<a href=\"../out/out.PasswordForgotten.php\">" . getMLText("password_forgotten") . "</a>\n";
 		if($tmpfoot) {
@@ -155,9 +168,7 @@ function guestLogin()
 			print implode(' | ', $tmpfoot);
 			print "</p>\n";
 		}
-?>
+		$this->contentEnd();
-<script language="JavaScript">document.form1.login.focus();</script>
-<?php
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ManageNotify.php

@@ -222,6 +222,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		echo "</div>";
 		echo "</div>";
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.MoveDocument.php

@@ -65,6 +65,7 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.MoveFolder.php

@@ -63,6 +63,7 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.MyAccount.php

@@ -117,6 +117,7 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
 		print "</div>\n";
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.MyDocuments.php

@@ -814,6 +814,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ObjectCheck.php

@@ -405,6 +405,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		}
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.OverrideContentStatus.php

@@ -100,6 +100,7 @@ function checkForm()
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.PasswordForgotten.php

@@ -67,6 +67,7 @@ class SeedDMS_View_PasswordForgotten extends SeedDMS_Bootstrap_Style {
 <script language="JavaScript">document.form1.email.focus();</script>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.PasswordSend.php

@@ -45,6 +45,7 @@ class SeedDMS_View_PasswordSend extends SeedDMS_Bootstrap_Style {
 <?php $this->contentContainerEnd(); ?>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveArchive.php

@@ -52,6 +52,7 @@ class SeedDMS_View_RemoveArchive extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveDocument.php

@@ -56,6 +56,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveDocumentFile.php

@@ -55,6 +55,7 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveDump.php

@@ -51,6 +51,7 @@ class SeedDMS_View_RemoveDump extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveEvent.php

@@ -53,6 +53,7 @@ class SeedDMS_View_RemoveEvent extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveFolder.php

@@ -54,6 +54,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveFolderFiles.php

@@ -52,6 +52,7 @@ class SeedDMS_View_RemoveFolderFiles extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveGroup.php

@@ -55,6 +55,7 @@ class SeedDMS_View_RemoveGroup extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveLog.php

@@ -58,6 +58,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveUser.php

@@ -73,6 +73,7 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveVersion.php

@@ -54,6 +54,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveWorkflow.php

@@ -63,6 +63,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 <?php
 		$this->contentContainerEnd();
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RemoveWorkflowFromDocument.php

@@ -104,6 +104,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ReturnFromSubWorkflow.php

@@ -135,6 +135,7 @@ function checkForm()
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ReviewDocument.php

@@ -208,6 +208,7 @@ function checkGrpForm()
 <?php
 		}
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ReviewSummary.php

@@ -161,6 +161,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RewindWorkflow.php

@@ -104,6 +104,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.RunSubWorkflow.php

@@ -105,6 +105,7 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Search.php

@@ -628,6 +628,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 // }}}
 		echo "</div>";
 		echo "</div>";
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.SearchForm.php

@@ -272,6 +272,7 @@ function checkForm()
 </div>
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.SearchFulltext.php

@@ -66,6 +66,7 @@ class SeedDMS_View_SearchFulltext extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		if ($numResults == 0) {
 			$this->contentContainerEnd();
+			$this->contentEnd();
 			$this->htmlEndPage();
 			exit;
 		}
@@ -122,6 +123,7 @@ class SeedDMS_View_SearchFulltext extends SeedDMS_Bootstrap_Style {
 
 		$this->contentContainerEnd();
 		$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $_GET);
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.SetExpires.php

@@ -74,6 +74,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.SetReviewersApprovers.php

@@ -239,6 +239,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.SetWorkflow.php

@@ -112,6 +112,7 @@ function showWorkflow(selectObj) {
 	</div>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Settings.php

@@ -716,6 +716,7 @@ if(is_writeable($settings->_configFilePath)) {
 
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Statistic.php

@@ -176,51 +176,50 @@ class SeedDMS_View_Statistic extends SeedDMS_Bootstrap_Style {
 </style>
 
 <?php
+		$this->contentHeading(getMLText("folders_and_documents_statistic"));
+		echo "<div class=\"row-fluid\">\n";
+		echo "<div class=\"span8\">\n";
+		echo "<div class=\"well\">\n";
 
-$this->contentHeading(getMLText("folders_and_documents_statistic"));
+		print "<table class=\"table-condensed\"><tr><td>\n";
-echo "<div class=\"row-fluid\">\n";
-echo "<div class=\"span8\">\n";
-echo "<div class=\"well\">\n";
 
-print "<table class=\"table-condensed\"><tr><td>\n";
+		print "<ul>\n";
+		$this->printFolder($rootfolder);
+		print "</ul>\n";
 
-print "<ul>\n";
+		print "</td></tr>";
-$this->printFolder($rootfolder);
-print "</ul>\n";
 
-print "</td></tr>";
+		print "</table>\n";
+		echo "</div>\n";
+		echo "</div>\n";
 
-print "</table>\n";
+		echo "<div class=\"span4\">\n";
-echo "</div>\n";
+		echo "<div class=\"well\">\n";
-echo "</div>\n";
+		print "<legend>".getMLText("legend")."</legend>\n";
+		print "<ul class=\"unstyled\">\n";
+		print "<li><span style=\"color:black\">".getMLText("access_inheritance")." </span></li>";
+		print "<li><span style=\"color:".$this->getAccessColor(M_ALL)."\">".getMLText("access_mode_all")." </span></li>";
+		print "<li><span style=\"color:".$this->getAccessColor(M_READWRITE)."\">".getMLText("access_mode_readwrite")." </span></li>";
+		print "<li><span style=\"color:".$this->getAccessColor(M_READ)."\">".getMLText("access_mode_read")." </span></li>";
+		print "<li><span style=\"color:".$this->getAccessColor(M_NONE)."\">".getMLText("access_mode_none")." </span></li>";
+		print "</ul>\n";
 
-echo "<div class=\"span4\">\n";
+		print "<legend>".getMLText("statistic")."</legend>\n";
-echo "<div class=\"well\">\n";
+		print "<ul class=\"unstyled\">\n";
-print "<legend>".getMLText("legend")."</legend>\n";
+		print "<li>".getMLText("folders").": ".$this->folder_count."</li>\n";
-print "<ul class=\"unstyled\">\n";
+		print "<li>".getMLText("documents").": ".$this->document_count."</li>\n";
-print "<li><span style=\"color:black\">".getMLText("access_inheritance")." </span></li>";
+		print "<li>".getMLText("files").": ".$this->file_count."</li>\n";
-print "<li><span style=\"color:".$this->getAccessColor(M_ALL)."\">".getMLText("access_mode_all")." </span></li>";
+		print "<li>".getMLText("storage_size").": ".SeedDMS_Core_File::format_filesize($this->storage_size)."</li>\n";
-print "<li><span style=\"color:".$this->getAccessColor(M_READWRITE)."\">".getMLText("access_mode_readwrite")." </span></li>";
-print "<li><span style=\"color:".$this->getAccessColor(M_READ)."\">".getMLText("access_mode_read")." </span></li>";
-print "<li><span style=\"color:".$this->getAccessColor(M_NONE)."\">".getMLText("access_mode_none")." </span></li>";
-print "</ul>\n";
 
-print "<legend>".getMLText("statistic")."</legend>\n";
+		print "</ul>\n";
-print "<ul class=\"unstyled\">\n";
-print "<li>".getMLText("folders").": ".$this->folder_count."</li>\n";
-print "<li>".getMLText("documents").": ".$this->document_count."</li>\n";
-print "<li>".getMLText("files").": ".$this->file_count."</li>\n";
-print "<li>".getMLText("storage_size").": ".SeedDMS_Core_File::format_filesize($this->storage_size)."</li>\n";
 
-print "</ul>\n";
+		echo "</div>\n";
+		echo "</div>\n";
+		echo "</div>\n";
 
-echo "</div>\n";
+		$this->contentContainerEnd();
-echo "</div>\n";
+		$this->contentEnd();
-echo "</div>\n";
+	$this->htmlEndPage();
-
-
-$this->contentContainerEnd();
-$this->htmlEndPage();
 	} /* }}} */
 }
 ?>

views/bootstrap/class.SubstituteUser.php

@@ -79,6 +79,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 		echo "</table>";
 		$this->contentContainerEnd();
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.Timeline.php

@@ -248,6 +248,7 @@ $(document).ready(function () {
 		echo "</div>\n";
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.TriggerWorkflow.php

@@ -132,6 +132,7 @@ function checkForm()
 			$this->contentContainerEnd();
 		}
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.UpdateDocument.php

@@ -133,6 +133,7 @@ $(document).ready( function() {
 			{
 				printMLText("no_update_cause_locked");
 				print "</div>";
+				$this->contentEnd();
 				$this->htmlEndPage();
 				exit;
 			}
@@ -591,6 +592,7 @@ $(document).ready( function() {
 
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.UserDefaultKeywords.php

@@ -190,6 +190,7 @@ showKeywords(sel);
 </script>
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.UserList.php

@@ -112,6 +112,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 		echo "</table>";
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.UsrMgr.php

@@ -491,6 +491,7 @@ $(document).ready( function() {
 </div>
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.UsrView.php

@@ -81,6 +81,7 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
 		echo "</table>\n";
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ViewDocument.php

@@ -395,6 +395,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 			print getMLText('document_content_missing');
 			$this->contentContainerEnd();
+			$this->contentEnd();
 			$this->htmlEndPage();
 			exit;
 		}
@@ -1262,8 +1263,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		  </div>
 		</div>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
-
 	} /* }}} */
 }
 ?>

views/bootstrap/class.ViewEvent.php

@@ -91,6 +91,7 @@ class SeedDMS_View_ViewEvent extends SeedDMS_Bootstrap_Style {
 
 		$this->contentContainerEnd();
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.ViewFolder.php

@@ -319,11 +319,11 @@ function folderSelected(id, name) {
 		}
 
 		echo "</div>\n"; // End of right column div
-
+		echo "</div>\n"; // End of div around left and right column
-		$this->contentEnd();
 
 		echo $this->callHook('postContent');
 
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.WorkflowActionsMgr.php

@@ -185,8 +185,8 @@ showWorkflowAction(sel);
 
 </script>
 
-
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.WorkflowMgr.php

@@ -351,8 +351,8 @@ showWorkflow(sel);
 
 </script>
 
-
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.WorkflowStatesMgr.php

@@ -202,8 +202,8 @@ showWorkflowState(sel);
 
 </script>
 
-
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

views/bootstrap/class.WorkflowSummary.php

@@ -161,8 +161,8 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_look_at");
 		}
 
-
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }