use new SeedDMS_Theme_Style, replace plain html by methods in theme style

views/bootstrap/class.AddDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for AddDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AddDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$dropfolderdir = $this->params['dropfolderdir'];

views/bootstrap/class.AddEvent.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for AddEvent view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AddEvent extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AddEvent extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];

views/bootstrap/class.AddFile.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for AddFile view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AddFile extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$enablelargefileupload = $this->params['enablelargefileupload'];

views/bootstrap/class.AddSubFolder.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for AddSubFolder view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AddSubFolder extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AddSubFolder extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];

views/bootstrap/class.AdminTools.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for AdminTools view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AdminTools extends SeedDMS_Theme_Style {
 
 	static function wrapRow($content) { /* {{{ */
 		return self::startRow().$content.self::endRow();

views/bootstrap/class.ApprovalSummary.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ApprovalSummary extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.ApproveDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ApproveDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ApproveDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ApproveDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -111,8 +111,6 @@ $(document).ready(function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("add_approval"));
 
-		$this->contentContainerStart();
-
 		// Display the Approval form.
 		$approvaltype = ($approvalStatus['type'] == 0) ? 'ind' : 'grp';
 		if($approvalStatus["status"]!=0) {
@@ -134,6 +132,8 @@ $(document).ready(function() {
 	<form class="form-horizontal" method="post" action="../op/op.ApproveDocument.php" id="form<?= $approvaltype ?>" name="form<?= $approvaltype ?>" enctype="multipart/form-data">
 	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
 <?php
+		$this->contentContainerStart();
+
 		$this->formField(
 			getMLText("comment"),
 			array(
@@ -160,6 +160,7 @@ $(document).ready(function() {
 				'options'=>$options,
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_approval'), $approvaltype.'Approval');
 ?>
 	<input type='hidden' name='approvalType' value='<?= $approvaltype ?>'/>
@@ -170,7 +171,6 @@ $(document).ready(function() {
 	<input type='hidden' name='version' value='<?php echo $content->getVersion(); ?>'/>
 	</form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.AttributeMgr.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AttributeMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AttributeMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$selattrdef = $this->params['selattrdef'];
@@ -172,7 +172,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
 				<input type="hidden" name="attrdefid" value="<?php echo $selattrdef->getID()?>">
 				<input type="hidden" name="action" value="removeattrdef">
-				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
+				<button type="submit" class="btn btn-secondary"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
 			</form>
 <?php
 		}

views/bootstrap/class.BackupTools.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for BackupTools view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_BackupTools extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -67,7 +67,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		print "<form class=\"form-inline\" action=\"../op/op.CreateVersioningFiles.php\" name=\"form1\">";
 		$this->printFolderChooserHtml("form1",M_READWRITE);
-		print "<input type='submit' class='btn' name='' value='".getMLText("versioning_file_creation")."'/>";
+		print "<input type='submit' class='btn btn-primary' name='' value='".getMLText("versioning_file_creation")."'/>";
 		print "</form>\n";
 
 		$this->contentContainerEnd();
@@ -81,7 +81,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 			print "<form action=\"../op/op.CreateFolderArchive.php\" name=\"form2\">";
 			$this->printFolderChooserHtml("form2",M_READWRITE);
 			print "<label class=\"checkbox\"><input type=\"checkbox\" name=\"human_readable\" value=\"1\">".getMLText("human_readable")."</label>";
-			print "<input type='submit' class='btn' name='' value='".getMLText("archive_creation")."'/>";
+			print "<input type='submit' class='btn btn-primary' name='' value='".getMLText("archive_creation")."'/>";
 			print "</form>\n";
 
 			// list backup files
@@ -137,7 +137,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 
 			print "<form action=\"../op/op.CreateDump.php\" name=\"form4\">";
-			print "<input type='submit' class='btn' name='' value='".getMLText("dump_creation")."'/>";
+			print "<input type='submit' class='btn btn-primary' name='' value='".getMLText("dump_creation")."'/>";
 			print "</form>\n";
 
 			// list backup files

views/bootstrap/class.Bootstrap.php

@@ -520,59 +520,145 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		return;
 	} /* }}} */
 
-	protected function showNavigationBar($menuitems) { /* {{{ */
+	protected function showNavigationBar($menuitems, $options = array()) { /* {{{ */
+		$content = '';
+		$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"nav".(isset($options['right']) ? ' pull-right' : '')."\">\n";
 		foreach($menuitems as $menuitem) {
 			if(!empty($menuitem['children'])) {
-				echo "    <li class=\"dropdown\">\n";
+				$content .= "    <li class=\"dropdown\">\n";
-				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
+				$content .= "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".$menuitem['label']." <i class=\"fa fa-caret-down\"></i></a>\n";
-				echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+				$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 				foreach($menuitem['children'] as $submenuitem) {
-					echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
+					if(!empty($submenuitem['children'])) {
+						$content .= "      <li class=\"dropdown-submenu\">\n";
+						$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".$submenuitem['label']."</a>\n";
+						$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
+						foreach($submenuitem['children'] as $subsubmenuitem) {
+							if(!empty($submenuitem['divider'])) {
+								$content .= "      <li class=\"divider\"></li>\n";
+							} else {
+								$content .= "      <li><a href=\"".$subsubmenuitem['link']."\"".(isset($subsubmenuitem['class']) ? " class=\"".$subsubmenuitem['class']."\"" : "").(isset($subsubmenuitem['rel']) ? " rel=\"".$subsubmenuitem['rel']."\"" : "");
+								if(!empty($subsubmenuitem['attributes']))
+									foreach($subsubmenuitem['attributes'] as $attr)
+										$content .= ' '.$attr[0].'="'.$attr[1].'"';
+								$content .= ">".$subsubmenuitem['label']."</a></li>";
+							}
+						}
+						$content .= "       </ul>\n";
+						$content .= "      </li>\n";
+					} else {
+						if(!empty($submenuitem['divider'])) {
+							$content .= "      <li class=\"divider\"></li>\n";
+						} else {
+							$content .= "      <li><a".(isset($submenuitem['link']) ? " href=\"".$submenuitem['link']."\"" : "").(isset($submenuitem['class']) ? " class=\"".$submenuitem['class']."\"" : "").(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '');
+							if(!empty($submenuitem['attributes']))
+								foreach($submenuitem['attributes'] as $attr)
+									$content .= ' '.$attr[0].'="'.$attr[1].'"';
+							$content .= ">".$submenuitem['label']."</a></li>\n";
+						}
+					}
 				}
-				echo "     </ul>\n";
+				$content .= "     </ul>\n";
 			} else {
-				echo "<li><a href=\"".$menuitem['link']."\"".(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '').">".getMLText($menuitem['label'])."</a></li>";
+				if(!empty($submenuitem['divider'])) {
+					$content .= "      <li class=\"divider\"></li>\n";
+				} else {
+					$content .= "<li><a".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '').">";
+					if(!empty($menuitem['attributes']))
+						foreach($menuitem['attributes'] as $attr)
+							$content .= ' '.$attr[0].'="'.$attr[1].'"';
+					$content .= $menuitem['label']."</a></li>";
+				}
 			}
 		}
+		$content .= "</ul>\n";
+		echo $content;
+	} /* }}} */
+
+	protected function showNavigationListWithBadges($menuitems, $options=array()) { /* {{{ */
+		$content = '';
+		$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"nav nav-list sidenav bs-docs-sidenav\">\n";
+		foreach($menuitems as $menuitem) {
+			$content .= "  <li class=\"\">\n";
+			$content .= '    <a';
+			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
+			if(!empty($menuitem['attributes']))
+				foreach($menuitem['attributes'] as $attr)
+					$content .= ' '.$attr[0].'="'.$attr[1].'"';
+			$content .= '>';
+			$content .= $menuitem['label'];
+			$content .= '<span class="badge badge-right">'.$menuitem['badge']."</span>";
+			$content .= '    </a>'."\n";
+			$content .= "  </li>\n";
+		}
+
+		$content .= "</ul>\n";
+		echo $content;
+	} /* }}} */
+
+	protected function showButtonwithMenu($button, $options=array()) { /* {{{ */
+		$content = '';
+		$content .= '
+<div class="btn-group">
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+		'.$button['label'].'
+    <span class="caret"></span>
+  </a>
+';
+		if($button['menuitems']) {
+			$content .= '
+	<ul class="dropdown-menu">
+';
+			foreach($button['menuitems'] as $menuitem) {
+				$content .= '
+		<li><a href="'.$menuitem['link'].'">'.$menuitem['label'].'</a><li>
+';
+			}
+			$content .= '
+	</ul>
+';
+		}
+		$content .= '
+</div>
+';
+		echo $content;
 	} /* }}} */
 
 	private function folderNavigationBar($folder) { /* {{{ */
 		$dms = $this->params['dms'];
 		if (!is_object($folder) || !$folder->isType('folder')) {
-			echo "<ul class=\"nav\">\n";
+			self::showNavigationBar(array());
-			echo "</ul>\n";
 			return;
 		}
 		$accessMode = $folder->getAccessMode($this->params['user']);
 		$folderID = $folder->getID();
 		echo "<id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=". $folderID ."&showtree=".showtree()."\" class=\"brand\">".getMLText("folder")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
-		echo "<ul class=\"nav\">\n";
 		$menuitems = array();
 
 		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
-			$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify');
+			$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>getMLText('edit_folder_notify'));
 		}
 		else if ($accessMode >= M_READWRITE) {
-			$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_subfolder');
+			$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_subfolder'));
-			$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_document');
+			$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
-				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_multiple_documents');
+				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'edit_folder_props');
+			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
 			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'move_folder');
+				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-					$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'rm_folder');
+					$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('rm_folder'));
 			}
 			if ($accessMode == M_ALL) {
-				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_access');
+				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>getMLText('edit_folder_access'));
 			}
-			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>'edit_existing_notify');
+			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>getMLText('edit_existing_notify'));
 		}
 		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {
-			$menuitems['index_folder'] = array('link'=>"../out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>'index_folder');
+			$menuitems['index_folder'] = array('link'=>"../out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>getMLText('index_folder'));
 		}
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
@@ -581,7 +667,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		self::showNavigationBar($menuitems);
 
-		echo "</ul>\n";
 		echo "</div>\n";
 		return;
 	} /* }}} */
@@ -592,38 +677,37 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$docid=".php?documentid=" . $document->getID();
 		echo "<id=\"first\"><a href=\"../out/out.ViewDocument". $docid ."\" class=\"brand\">".getMLText("document")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
-		echo "<ul class=\"nav\">\n";
 		$menuitems = array();
 
 		if ($accessMode >= M_READWRITE) {
 			if (!$document->isLocked()) {
-				$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+				$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
-				$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document');
+				$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>getMLText('lock_document'));
-				$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>'edit_document_props');
+				$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
-				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
+				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 			}
 			else {
 				$lockingUser = $document->getLockingUser();
 				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
-					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
-					$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document');
+					$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>getMLText('unlock_document'));
-					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>'edit_document_props');
+					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
-					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
+					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 				}
 			}
 			if($accessobject->maySetExpires()) {
-				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
+				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>getMLText('expires'));
 			}
 		}
 		if ($accessMode == M_ALL) {
-			$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document');
+			$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>getMLText('rm_document'));
-			$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access');
+			$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>getMLText('edit_document_access'));
 		}
 		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
-			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
+			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>getMLText('edit_existing_notify'));
 		}
 		if ($this->params['user']->isAdmin()) {
-			$menuitems['transfer_document'] = array('link'=>"../out/out.TransferDocument". $docid, 'label'=>'transfer_document');
+			$menuitems['transfer_document'] = array('link'=>"../out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document'));
 		}
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
@@ -644,7 +728,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		self::showNavigationBar($menuitems);
 
-		echo "</ul>\n";
 		echo "</div>\n";
 		return;
 	} /* }}} */
@@ -652,20 +735,19 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	private function accountNavigationBar() { /* {{{ */
 		echo "<id=\"first\"><a href=\"../out/out.MyAccount.php\" class=\"brand\">".getMLText("my_account")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
-		echo "<ul class=\"nav\">\n";
 
 		$menuitems = array();
 		if ($this->params['user']->isAdmin() || !$this->params['disableselfedit'])
-			$menuitems['edit_user_details'] = array('link'=>"../out/out.EditUserData.php", 'label'=>'edit_user_details');
+			$menuitems['edit_user_details'] = array('link'=>"../out/out.EditUserData.php", 'label'=>getMLText('edit_user_details'));
 		
 		if (!$this->params['user']->isAdmin()) 
-			$menuitems['edit_default_keywords'] = array('link'=>"../out/out.UserDefaultKeywords.php", 'label'=>'edit_default_keywords');
+			$menuitems['edit_default_keywords'] = array('link'=>"../out/out.UserDefaultKeywords.php", 'label'=>getMLText('edit_default_keywords'));
 
-		$menuitems['edit_notify'] = array('link'=>"../out/out.ManageNotify.php", 'label'=>'edit_existing_notify');
+		$menuitems['edit_notify'] = array('link'=>"../out/out.ManageNotify.php", 'label'=>getMLText('edit_existing_notify'));
 
 		if ($this->params['enableusersview']){
-			$menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>'users');
+			$menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>getMLText('users'));
-			$menuitems['groups'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups');
+			$menuitems['groups'] = array('link'=>"../out/out.GroupView.php", 'label'=>getMLText('groups'));
 		}		
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
@@ -674,7 +756,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		self::showNavigationBar($menuitems);
 
-		echo "</ul>\n";
 		echo "</div>\n";
 		return;
 	} /* }}} */
@@ -683,16 +764,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		echo "<id=\"first\"><a href=\"../out/out.MyDocuments.php?inProcess=1\" class=\"brand\">".getMLText("my_documents")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
-		echo "<ul class=\"nav\">\n";
 
 		$menuitems = array();
-		$menuitems['inprocess'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'documents_in_process');
+		$menuitems['inprocess'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>getMLText('documents_in_process'));
-		$menuitems['all_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'all_documents');
+		$menuitems['all_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>getMLText('all_documents'));
 		if($this->params['workflowmode'] == 'traditional' || $this->params['workflowmode'] == 'traditional_only_approval') {
-			$menuitems['review_summary'] = array('link'=>"../out/out.ReviewSummary.php", 'label'=>'review_summary');
+			$menuitems['review_summary'] = array('link'=>"../out/out.ReviewSummary.php", 'label'=>getMLText('review_summary'));
-			$menuitems['approval_summary'] = array('link'=>"../out/out.ApprovalSummary.php", 'label'=>'approval_summary');
+			$menuitems['approval_summary'] = array('link'=>"../out/out.ApprovalSummary.php", 'label'=>getMLText('approval_summary'));
 		} else {
-			$menuitems['workflow_summary'] = array('link'=>"../out/out.WorkflowSummary.php", 'label'=>'workflow_summary');
+			$menuitems['workflow_summary'] = array('link'=>"../out/out.WorkflowSummary.php", 'label'=>getMLText('workflow_summary'));
 		}
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
@@ -701,7 +781,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		self::showNavigationBar($menuitems);
 
-		echo "</ul>\n";
 		echo "</div>\n";
 		return;
 	} /* }}} */
@@ -709,47 +788,46 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	private function adminToolsNavigationBar() { /* {{{ */
 		echo "    <id=\"first\"><a href=\"../out/out.AdminTools.php\" class=\"brand\">".getMLText("admin_tools")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
-		echo "   <ul class=\"nav\">\n";
 
 		$menuitems = array();
-		$menuitems['user_group_management'] = array('link'=>"#", 'label'=>'user_group_management');
+		$menuitems['user_group_management'] = array('link'=>"#", 'label'=>getMLText('user_group_management'));
-		$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>'user_management');
+		$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>getMLText('user_management'));
-		$menuitems['user_group_management']['children']['group_management'] = array('link'=>"../out/out.GroupMgr.php", 'label'=>'group_management');
+		$menuitems['user_group_management']['children']['group_management'] = array('link'=>"../out/out.GroupMgr.php", 'label'=>getMLText('group_management'));
-		$menuitems['user_group_management']['children']['user_list'] = array('link'=>"../out/out.UserList.php", 'label'=>'user_list');
+		$menuitems['user_group_management']['children']['user_list'] = array('link'=>"../out/out.UserList.php", 'label'=>getMLText('user_list'));
 		
-		$menuitems['definitions'] = array('link'=>"#", 'label'=>'definitions');
+		$menuitems['definitions'] = array('link'=>"#", 'label'=>getMLText('definitions'));
-		$menuitems['definitions']['children']['default_keywords'] = array('link'=>"../out/out.DefaultKeywords.php", 'label'=>'global_default_keywords');
+		$menuitems['definitions']['children']['default_keywords'] = array('link'=>"../out/out.DefaultKeywords.php", 'label'=>getMLText('global_default_keywords'));
-		$menuitems['definitions']['children']['document_categories'] = array('link'=>"../out/out.Categories.php", 'label'=>'global_document_categories');
+		$menuitems['definitions']['children']['document_categories'] = array('link'=>"../out/out.Categories.php", 'label'=>getMLText('global_document_categories'));
-		$menuitems['definitions']['children']['attribute_definitions'] = array('link'=>"../out/out.AttributeMgr.php", 'label'=>'global_attributedefinitions');
+		$menuitems['definitions']['children']['attribute_definitions'] = array('link'=>"../out/out.AttributeMgr.php", 'label'=>getMLText('global_attributedefinitions'));
 		if($this->params['workflowmode'] == 'advanced') {
-			$menuitems['definitions']['children']['workflows'] = array('link'=>"../out/out.WorkflowMgr.php", 'label'=>'global_workflows');
+			$menuitems['definitions']['children']['workflows'] = array('link'=>"../out/out.WorkflowMgr.php", 'label'=>getMLText('global_workflows'));
-			$menuitems['definitions']['children']['workflow_states'] = array('link'=>"../out/out.WorkflowStatesMgr.php", 'label'=>'global_workflow_states');
+			$menuitems['definitions']['children']['workflow_states'] = array('link'=>"../out/out.WorkflowStatesMgr.php", 'label'=>getMLText('global_workflow_states'));
-			$menuitems['definitions']['children']['workflow_actions'] = array('link'=>"../out/out.WorkflowActionsMgr.php", 'label'=>'global_workflow_actions');
+			$menuitems['definitions']['children']['workflow_actions'] = array('link'=>"../out/out.WorkflowActionsMgr.php", 'label'=>getMLText('global_workflow_actions'));
 		}
 
 		if($this->params['enablefullsearch']) {
-			$menuitems['fulltext'] = array('link'=>"#", 'label'=>'fullsearch');
+			$menuitems['fulltext'] = array('link'=>"#", 'label'=>getMLText('fullsearch'));
-			$menuitems['fulltext']['children']['update_fulltext_index'] = array('link'=>"../out/out.Indexer.php", 'label'=>'update_fulltext_index');
+			$menuitems['fulltext']['children']['update_fulltext_index'] = array('link'=>"../out/out.Indexer.php", 'label'=>getMLText('update_fulltext_index'));
-			$menuitems['fulltext']['children']['create_fulltext_index'] = array('link'=>"../out/out.CreateIndex.php", 'label'=>'create_fulltext_index');
+			$menuitems['fulltext']['children']['create_fulltext_index'] = array('link'=>"../out/out.CreateIndex.php", 'label'=>getMLText('create_fulltext_index'));
-			$menuitems['fulltext']['children']['fulltext_info'] = array('link'=>"../out/out.IndexInfo.php", 'label'=>'fulltext_info');
+			$menuitems['fulltext']['children']['fulltext_info'] = array('link'=>"../out/out.IndexInfo.php", 'label'=>getMLText('fulltext_info'));
 		}
 
-		$menuitems['backup_log_management'] = array('link'=>"#", 'label'=>'backup_log_management');
+		$menuitems['backup_log_management'] = array('link'=>"#", 'label'=>getMLText('backup_log_management'));
-		$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.BackupTools.php", 'label'=>'backup_tools');
+		$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.BackupTools.php", 'label'=>getMLText('backup_tools'));
 		if ($this->params['logfileenable'])
-			$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>'log_management');
+			$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>getMLText('log_management'));
 
-		$menuitems['misc'] = array('link'=>"#", 'label'=>'misc');
+		$menuitems['misc'] = array('link'=>"#", 'label'=>getMLText('misc'));
-		$menuitems['misc']['children']['import_fs'] = array('link'=>"../out/out.ImportFS.php", 'label'=>'import_fs');
+		$menuitems['misc']['children']['import_fs'] = array('link'=>"../out/out.ImportFS.php", 'label'=>getMLText('import_fs'));
-		$menuitems['misc']['children']['import_users'] = array('link'=>"../out/out.ImportUsers.php", 'label'=>'import_users');
+		$menuitems['misc']['children']['import_users'] = array('link'=>"../out/out.ImportUsers.php", 'label'=>getMLText('import_users'));
-		$menuitems['misc']['children']['folders_and_documents_statistic'] = array('link'=>"../out/out.Statistic.php", 'label'=>'folders_and_documents_statistic');
+		$menuitems['misc']['children']['folders_and_documents_statistic'] = array('link'=>"../out/out.Statistic.php", 'label'=>getMLText('folders_and_documents_statistic'));
-		$menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>'charts');
+		$menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>getMLText('charts'));
-		$menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>'timeline');
+		$menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>getMLText('timeline'));
-		$menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>'objectcheck');
+		$menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>getMLText('objectcheck'));
-		$menuitems['misc']['children']['documents_expired'] = array('link'=>"../out/out.ExpiredDocuments.php", 'label'=>'documents_expired');
+		$menuitems['misc']['children']['documents_expired'] = array('link'=>"../out/out.ExpiredDocuments.php", 'label'=>getMLText('documents_expired'));
-		$menuitems['misc']['children']['extension_manager'] = array('link'=>"../out/out.ExtensionMgr.php", 'label'=>'extension_manager');
+		$menuitems['misc']['children']['extension_manager'] = array('link'=>"../out/out.ExtensionMgr.php", 'label'=>getMLText('extension_manager'));
-		$menuitems['misc']['children']['clear_cache'] = array('link'=>"../out/out.ClearCache.php", 'label'=>'clear_cache');
+		$menuitems['misc']['children']['clear_cache'] = array('link'=>"../out/out.ClearCache.php", 'label'=>getMLText('clear_cache'));
-		$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>'version_info');
+		$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>getMLText('version_info'));
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
 		if($this->hasHook('admintoolsNavigationBar'))
@@ -757,7 +835,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		self::showNavigationBar($menuitems);
 
-		echo "   </ul>\n";
 		echo "</div>\n";
 		return;
 	} /* }}} */
@@ -782,11 +859,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	private function calendarNavigationBar($d){ /* {{{ */
 		echo "<id=\"first\"><a href=\"../out/out.Calendar.php\" class=\"brand\">".getMLText("calendar")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
-		echo "<ul class=\"nav\">\n";
 
 		$menuitems = array();
 		if (!$this->params['user']->isGuest())
-			$menuitems['addevent'] = array('link'=>"../out/out.AddEvent.php", 'label'=>'add_event');
+			$menuitems['addevent'] = array('link'=>"../out/out.AddEvent.php", 'label'=>getMLText('add_event'));
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
 		if($this->hasHook('calendarNavigationBar'))
@@ -794,7 +870,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		self::showNavigationBar($menuitems);
 
-		echo "</ul>\n";
 		echo "</div>\n";
 		return;
 	

views/bootstrap/class.Calendar.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 
 	function iteminfo() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.Categories.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Categories extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Categories extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$selcat = $this->params['selcategory'];

views/bootstrap/class.CategoryChooser.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for CategoryChooser view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_CategoryChooser extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_CategoryChooser extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.ChangePassword.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ChangePassword view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ChangePassword extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ChangePassword extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -48,7 +48,6 @@ document.form1.newpassword.focus();
 		$this->globalBanner();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("change_password"));
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.ChangePassword.php" method="post" name="form1">
 	<?php echo createHiddenFieldWithKey('changepassword'); ?>
@@ -59,6 +58,7 @@ document.form1.newpassword.focus();
 		if ($hash) {
 			echo "<input type='hidden' name='hash' value='".$hash."'/>";
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("password"),
 			'<input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password">'
@@ -83,11 +83,10 @@ document.form1.newpassword.focus();
 				'autocomplete'=>'off',
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_password'));
 ?>
-
 </form>
-<?php $this->contentContainerEnd(); ?>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
 <?php
 		$this->contentEnd();

views/bootstrap/class.Charts.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Charts view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Charts extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Charts extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$data = $this->params['data'];

views/bootstrap/class.ClearCache.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ClearCache view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.Clipboard.php

@@ -50,29 +50,38 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
 			return '';
 		}
+
+		$menuitems = [];
+
 		$content = '';
 		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
 		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$subitems = [];
 		foreach($clipboard['folders'] as $folderid) {
-			if($folder = $this->params['dms']->getFolder($folderid))
+			if($folder = $this->params['dms']->getFolder($folderid)) {
 				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$subitems[] = array('label'=>'<i class="fa fa-folder-o"></i> '.$folder->getName(), 'link'=>"../out/out.ViewFolder.php?folderid=".$folder->getID(), 'class'=>"table-row-folder droptarget", 'rel'=>"folder_".$folder->getID(), 'attributes'=>array(array('data-droptarget', "folder_".$folder->getID()), array('data-name', htmlspecialchars($folder->getName(), ENT_QUOTES))));
+			}
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
 				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$subitems[] = array('label'=>'<i class="fa fa-file"></i> '.$document->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$document->getID(), 'class'=>"table-row-document droptarget", 'rel'=>"document_".$document->getID(), 'attributes'=>array(array('data-droptarget', "document_".$document->getID()), array('data-name', htmlspecialchars($document->getName(), ENT_QUOTES))));
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
+		$subitems[] = array('divider'=>true);
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
 			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode('../out/out.ViewFolder.php?folderid='.$this->params['folder']->getID())."\">".getMLText("move_clipboard")."</a></li>\n";
+			$subitems[] = array('label'=>getMLText("move_clipboard"), 'link'=>"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode('../out/out.ViewFolder.php?folderid='.$this->params['folder']->getID()));
 		}
 //		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
 //		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
-		$menuitems = array();
+		$subitems[] = array('label'=>getMLText('clear_clipboard'), 'attributes'=>array(array('class', 'ajax-click'), array('data-href', '../op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
-		$menuitems['clear_clipboard'] = array('label'=>'clear_clipboard', 'attributes'=>array(array('class', 'ajax-click'), array('data-href', '../op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
 		if($this->hasHook('clipboardMenuItems'))
-			$menuitems = $this->callHook('clipboardMenuItems', $clipboard, $menuitems);
+			$subitems = $this->callHook('clipboardMenuItems', $clipboard, $subitems);
+		/*
 		foreach($menuitems as $menuitem) {
 			$content .= "<li>";
 			$content .= "<a";
@@ -85,10 +94,13 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 			$content .= getMLText($menuitem['label']);
 			$content .= "</a></li>";
 		}
+		 */
 		$content .= "     </ul>\n";
 		$content .= "    </li>\n";
 		$content .= "   </ul>\n";
-		echo $content;
+		$menuitems['clipboard'] = array('label'=>getMLText('clipboard')." (".count($clipboard['folders'])."/". count($clipboard['docs']).")", 'children'=>$subitems);
+		self::showNavigationBar($menuitems, array('right'=>true));
+//		echo $content;
 	} /* }}} */
 
 	/**

views/bootstrap/class.CreateIndex.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for CreateIndex view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_CreateIndex extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_CreateIndex extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -41,12 +41,10 @@ class SeedDMS_View_CreateIndex extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText('admin_tools'), 'admin_tools');
 		$this->contentHeading(getMLText("create_fulltext_index"));
-		$this->contentContainerStart();
 
-		echo '<p>'.getMLText('create_fulltext_index_warning').'</p>';
+		$this->warningMsg(getMLText('create_fulltext_index_warning'));
-		echo '<a href="out.Indexer.php?create=1&confirm=1" class="btn">'.getMLText('confirm_create_fulltext_index').'</a>';
+		echo '<p><a href="out.Indexer.php?create=1&confirm=1" class="btn btn-primary">'.getMLText('confirm_create_fulltext_index').'</a></p>';
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.DefaultKeywords.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for DefaultKeywords view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_DefaultKeywords extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.DocumentAccess.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for DocumentAccess view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_DocumentAccess extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_DocumentAccess extends SeedDMS_Theme_Style {
 	function printAccessModeSelection($defMode) { /* {{{ */
 		echo self::getAccessModeSelection($defMode);
 	} /* }}} */
@@ -137,14 +137,14 @@ $(document).ready( function() {
 	<input type="hidden" name="documentid" value="<?php print $document->getId();?>">
 	<input type="hidden" name="action" value="notinherit">
 	<input type="hidden" name="mode" value="copy">
-	<input type="submit" class="btn" value="<?php printMLText("inherits_access_copy_msg")?>">
+	<input type="submit" class="btn btn-primary" value="<?php printMLText("inherits_access_copy_msg")?>">
 	</form>
 	<form action="../op/op.DocumentAccess.php" style="display: inline-block;">
   <?php echo createHiddenFieldWithKey('documentaccess'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getId();?>">
 	<input type="hidden" name="action" value="notinherit">
 	<input type="hidden" name="mode" value="empty">
-	<input type="submit" class="btn" value="<?php printMLText("inherits_access_empty_msg")?>">
+	<input type="submit" class="btn btn-primary" value="<?php printMLText("inherits_access_empty_msg")?>">
 	</form>
 	</p>
 <?php

views/bootstrap/class.DocumentChooser.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for DocumentChooser view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_DocumentChooser extends SeedDMS_Theme_Style {
 
 	public function subtree() { /* {{{ */
 		$user = $this->params['user'];

views/bootstrap/class.DocumentNotify.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for DocumentNotify view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_DocumentNotify extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_DocumentNotify extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.DocumentVersionDetail.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style {
 
 	/**
 	 * Output a single attribute in the document info section
@@ -160,9 +160,9 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$this->rowStart();
 		$this->columnStart(4);
 		$this->contentHeading(getMLText("document_infos"));
-		$this->contentContainerStart();
+//		$this->contentContainerStart();
 ?>
-<table class="table-condensed">
+<table class="table table-condensed table-sm">
 <tr>
 <td><?php printMLText("owner");?>:</td>
 <td>
@@ -239,7 +239,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 ?>
 </table>
 <?php
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
 		$this->preview();
 		$this->columnEnd();
 		$this->columnStart(8);
@@ -262,8 +262,20 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		print "</ul>";
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
 		$previewer->createPreview($version);
+		if ($file_exists) {
+			if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) {
+				print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=". $version->getVersion()."\">";
+			} else {
+				print "<a href=\"../op/op.Download.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\">";
+			}
+		}
 		if($previewer->hasPreview($version)) {
 			print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
+		} else {
+			print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+		}
+		if ($file_exists) {
+			print "</a>";
 		}
 		print "</td>\n";
 

views/bootstrap/class.DropFolderChooser.php

@@ -66,7 +66,7 @@ $('.folderselect').click(function(ev) {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 
 		$c = 0; // count files
-		$filecontent = '';
+		$menuitems['dropfolder'] = array('label'=>'', 'children'=>array());
 		$dir = rtrim($dropfolderdir, '/').'/'.$user->getLogin();
 		/* Check if we are still looking in the configured directory and
 		 * not somewhere else, e.g. if the login was '../test'
@@ -80,34 +80,30 @@ $('.folderselect').click(function(ev) {
 					if($entry != '..' && $entry != '.') {
 						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
 							$c++;
+							$subitem = array('label'=>'', 'attributes'=>array(array('title', getMLText('menu_upload_from_dropfolder'))));
+							if($folder)
+								$subitem['link'] = '../out/out.AddDocument.php?folderid='.$folder->getId()."&dropfolderfileform1=".urldecode($entry);
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
-							$filecontent .= "<li><a".($folder ? " href=\"../out/out.AddDocument.php?folderid=".$folder->getId()."&dropfolderfileform1=".urldecode($entry)."\" title=\"".getMLText('menu_upload_from_dropfolder')."\"" : "").">";
 							if($previewwidth) {
 								$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 								if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-									$filecontent .= "<div class=\"dropfolder-menu-img\" style=\"display: none; overflow:hidden; position: absolute; left:-".($previewwidth+10)."px; border: 1px solid #888;background: white;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+									$subitem['label'] .= "<div class=\"dropfolder-menu-img\" style=\"display: none; overflow:hidden; position: absolute; left:-".($previewwidth+10)."px; border: 1px solid #888;background: white;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
 								}
 							}
-							$filecontent .= "<div class=\"dropfolder-menu-text\" style=\"margin-left:10px; margin-right: 10px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
+							$subitem['label'] .= "<div class=\"dropfolder-menu-text\" style=\"margin-left:10px; margin-right: 10px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div>";
+							$menuitems['dropfolder']['children'][] = $subitem;
 						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
-							$filecontent .= "<li><a _href=\"\">".$entry."</a></li>";
+							$subitem = array('label'=>$entry);
+							$menuitems['dropfolder']['children'][] = $subitem;
 						}
 					}
 				}
 			}
 		}
-		$content = '';
 		if($c) {
-			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
+			$menuitems['dropfolder']['label'] = getMLText('menu_dropfolder')." (".$c.")";
-			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
+			self::showNavigationBar($menuitems, array('id'=>'main-menu-dropfolderlist', 'right'=>true));
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
-			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\" style=\"width: 400px;\">\n";
-			$content .= $filecontent;
-			$content .= "     </ul>\n";
-			$content .= "    </li>\n";
-			$content .= "   </ul>\n";
 		}
-		echo $content;
 	} /* }}} */
 
 	function show() { /* {{{ */

views/bootstrap/class.EditAttributes.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditAttributes view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.EditComment.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditComment view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditComment extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditComment extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];

views/bootstrap/class.EditDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];

views/bootstrap/class.EditDocumentFile.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditDocumentFile view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditDocumentFile extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -43,7 +43,6 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("edit"));
-		$this->contentContainerStart();
 
 ?>
 <form action="../op/op.EditDocumentFile.php" class="form-horizontal" name="form1" method="post">
@@ -51,6 +50,7 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="fileid" value="<?php echo $file->getID()?>">
 <?php
+		$this->contentContainerStart();
 		$options = array();
 		$options[] = array("", getMLText('document'));
 		$versions = $document->getContent();
@@ -94,13 +94,11 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
 				'checked'=>$file->isPublic()
 			)
 		);
-?>
+		$this->contentContainerEnd();
-<?php
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.EditFolder.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditFolder view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditFolder extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditFolder extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];

views/bootstrap/class.EditOnline.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditOnline view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditOnline extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditOnline extends SeedDMS_Theme_Style {
 	var $dms;
 	var $folder_count;
 	var $document_count;
@@ -127,10 +127,10 @@ $(document).ready(function()	{
 
 		$set = 'markdown'; //default or markdown
 		$skin = 'simple'; // simple or markitup
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/markitup/skins/'.$skin.'/style.css" rel="stylesheet">'."\n", 'css');
+		$this->htmlAddHeader('<link href="../styles/bootstrap/markitup/skins/'.$skin.'/style.css" rel="stylesheet">'."\n", 'css');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/markitup/sets/'.$set.'/style.css" rel="stylesheet">'."\n", 'css');
+		$this->htmlAddHeader('<link href="../styles/bootstrap/markitup/sets/'.$set.'/style.css" rel="stylesheet">'."\n", 'css');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/markitup/jquery.markitup.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/markitup/jquery.markitup.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/markitup/sets/'.$set.'/set.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/markitup/sets/'.$set.'/set.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("edit_online"));
 		$this->globalNavigation();
@@ -143,7 +143,7 @@ $(document).ready(function()	{
 ?>
 <form action="../op/op.EditOnline.php" id="form1" method="post">
 <input type="hidden" name="documentid" value="<?php echo $document->getId(); ?>" />
-<textarea id="markdown" name="data" width="100%" rows="20">
+<textarea id="markdown" name="data" style="width: 100%;" rows="15">
 <?php
 		$luser = $document->getLatestContent()->getUser();
 		echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath()), ENT_SUBSTITUTE);

views/bootstrap/class.EditUserData.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditUserData view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditUserData extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.ErrorDlg.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ErrorDlg view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ErrorDlg extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -45,12 +45,10 @@ class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style {
 			$this->contentStart();
 		}
 
-		print "<div class=\"alert alert-error\">";
 		print "<h4>".getMLText('error')."!</h4>";
-		print htmlspecialchars($errormsg);
+		$this->errorMsg(htmlspecialchars($errormsg));
-		print "</div>";
 		if($showbutton)
-			print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
+			print "<div><button class=\"btn btn-primary history-back\">".getMLText('back')."</button></div>";
 		
 		$this->contentEnd();
 		$this->htmlEndPage();

views/bootstrap/class.ExpiredDocuments.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.ExtensionMgr.php

@@ -273,8 +273,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 		$this->columnStart(8);
 ?>
 		<ul class="nav nav-tabs" id="extensionstab">
-			<li class="<?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a data-target="#installed" data-toggle="tab"><?= getMLText('extension_mgr_installed'); ?></a></li>
+			<li class="nav-item <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a class="nav-link <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" data-target="#installed" data-toggle="tab"><?= getMLText('extension_mgr_installed'); ?></a></li>
-			<li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extension_mgr_repository'); ?></a></li>
+			<li class="nav-item <?php if($currenttab == 'repository') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'repository') echo 'active'; ?>" data-target="#repository" data-toggle="tab"><?= getMLText('extension_mgr_repository'); ?></a></li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed">

views/bootstrap/class.FolderAccess.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for FolderAccess view
@@ -29,13 +29,13 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_FolderAccess extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_FolderAccess extends SeedDMS_Theme_Style {
 	function printAccessModeSelection($defMode) { /* {{{ */
 		echo self::getAccessModeSelection($defMode);
 	} /* }}} */
 
 	function getAccessModeSelection($defMode) { /* {{{ */
-		$content = "<select name=\"mode\">\n";
+		$content = "<select name=\"mode\" class=\"form-control\">\n";
 		$content .= "\t<option value=\"".M_NONE."\"" . (($defMode == M_NONE) ? " selected" : "") . ">" . getMLText("access_mode_none") . "\n";
 		$content .= "\t<option value=\"".M_READ."\"" . (($defMode == M_READ) ? " selected" : "") . ">" . getMLText("access_mode_read") . "\n";
 		$content .= "\t<option value=\"".M_READWRITE."\"" . (($defMode == M_READWRITE) ? " selected" : "") . ">" . getMLText("access_mode_readwrite") . "\n";
@@ -183,7 +183,10 @@ $(document).ready(function() {
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
-
+<?php
+		$this->contentContainerEnd();
+		$this->contentContainerStart();
+?>
 <form class="form-horizontal" action="../op/op.FolderAccess.php" id="form1" name="form1">
 <?php echo createHiddenFieldWithKey('folderaccess'); ?>
 <input type="hidden" name="folderid" value="<?php print $folder->getID()?>">

views/bootstrap/class.FolderChooser.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for FolderChooser view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_FolderChooser extends SeedDMS_Theme_Style {
 
 	public function subtree() { /* {{{ */
 		$user = $this->params['user'];

views/bootstrap/class.FolderNotify.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for FolderNotify view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_FolderNotify extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_FolderNotify extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.GroupMgr.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_GroupMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_GroupMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$selgroup = $this->params['selgroup'];
@@ -155,21 +155,15 @@ $(document).ready( function() {
 		$selgroup = $this->params['selgroup'];
 
 		if($selgroup) {
-?>
+			$button = array(
-<div class="btn-group">
+				'label'=>getMLText('action'),
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+				'menuitems'=>array(
-		<?php echo getMLText('action'); ?>
+				)
-    <span class="caret"></span>
+			);
-  </a>
+			$button['menuitems'][] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_group"), 'link'=>'../out/out.RemoveGroup.php?groupid='.$selgroup->getID());
-  <ul class="dropdown-menu">
-<?php
-			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
 			if($selgroup->getUsers())
-				echo '<li><a href="../op/op.UserListCsv.php?groupid='.$selgroup->getID().'"><i class="fa fa-download"></i> '.getMLText("export_user_list_csv").'</a><li>';
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-download"></i> '.getMLText("export_user_list_csv"), 'link'=>'../op/op.UserListCsv.php?groupid='.$selgroup->getID());
-?>
+			self::showButtonwithMenu($button);
-	</ul>
-</div>
-<?php
 		}
 	} /* }}} */
 

views/bootstrap/class.GroupView.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for GroupView view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_GroupView extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_GroupView extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.Help.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Help view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Help extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.Hooks.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Hooks view
@@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2016 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Hooks extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Hooks extends SeedDMS_Theme_Style {
 
 	/**
 	 * List all registered hooks
@@ -37,7 +37,7 @@ class SeedDMS_View_Hooks extends SeedDMS_Bootstrap_Style {
 		if(!isset($GLOBALS['SEEDDMS_HOOKS']))
 			return;
 
-		echo "<table class=\"table\">\n";
+		echo "<table class=\"table table-condensed table-sm\">\n";
 		echo "<thead>";
 		echo "<tr><th>Type</th><th>Name of hook</th><th>Name of class</th><th>File</th></tr>\n";
 		echo "</thead>";

views/bootstrap/class.ImportFS.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ImportFS view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.ImportUsers.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ImportUsers view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.IndexInfo.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for IndexInfo view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_IndexInfo extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.Indexer.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class for processing a single folder
@@ -105,7 +105,7 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Indexer extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -223,13 +223,9 @@ $(document).ready( function() {
 			$index = $fulltextservice->Indexer();
 ?>
 <style type="text/css">
-li {line-height: 20px;}
 div.document {line-height: 20px;}
 div.document:hover {background-color: #eee;}
 div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
-.nav-header {line-height: 19px; margin-bottom: 0px;}
-.nav-list {padding-right: 0px;}
-.nav-list>li.document:hover {background-color: #eee;}
 .indexstatus {font-weight: bold; float: right;}
 .progress {margin-bottom: 2px;}
 .bar-legend {text-align: right; font-size: 85%; margin-bottom: 15px;}
@@ -237,13 +233,13 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 		<div style="max-width: 900px;">
 		<div>
 			<div class="progress">
-				<div class="bar total-bar" role="progressbar" style="width: 100%;"></div>
+				<div class="progress-bar bar total-bar" role="progressbar" style="width: 100%;"></div>
 			</div>
 			<div class="bar-legend"><?php printMLText('overall_indexing_progress'); ?></div>
 		</div>
 		<div>
 			<div class="progress">
-				<div class="bar queue-bar" role="progressbar" style="width: 100%;"></div>
+				<div class="progress-bar bar queue-bar" role="progressbar" style="width: 100%;"></div>
 			</div>
 			<div class="bar-legend"><?php printMLText('indexing_tasks_in_queue'); ?></div>
 		</div>

views/bootstrap/class.Info.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Info view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.KeywordChooser.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for KeywordChooser view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_KeywordChooser extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_KeywordChooser extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$form = $this->params['form'];

views/bootstrap/class.LogManagement.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for LogManagement view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_LogManagement extends SeedDMS_Theme_Style {
 
 	function filelist($entries, $mode) { /* {{{ */
 		$print_header = true;

views/bootstrap/class.Login.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Login view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Login extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Login extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -149,7 +149,7 @@ $(document).ready( function() {
 			)
 		);
 		if($enableLanguageSelector) {
-			$html = "<select id=\"languageselector\" name=\"lang\">";
+			$html = "<select id=\"languageselector\" class=\"form-control\" name=\"lang\">";
 			$html .= "<option value=\"\">-";
 			foreach ($languages as $currLang) {
 				$html .= "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
@@ -161,7 +161,7 @@ $(document).ready( function() {
 			);
 		}
 		if($enableThemeSelector) {
-			$html = "<select id=\"themeselector\" name=\"sesstheme\">";
+			$html = "<select id=\"themeselector\" class=\"form-control\" name=\"sesstheme\">";
 			$html .= "<option value=\"\">-";
 			foreach ($themes as $currTheme) {
 				$html .= "<option value=\"".$currTheme."\">".$currTheme;

views/bootstrap/class.ManageNotify.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ManageNotify extends SeedDMS_Theme_Style {
 
 	// Get list of subscriptions for documents or folders for user or groups
 	function getNotificationList($as_group, $folders) { /* {{{ */
@@ -82,8 +82,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->folderListRow($fld, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
-					else print "<a href='../out/out.FolderNotify.php?folderid=".$fld->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
+					else print "<a href='../out/out.FolderNotify.php?folderid=".$fld->getID()."' class=\"btn btn-danger btn-mini btn-sm\">".getMLText("edit")."</a>";
 					print "</td>";
 					echo $this->folderListRowEnd($fld);
 				}
@@ -120,8 +120,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->documentListRow($doc, $previewer, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
-					else print "<a href='../out/out.DocumentNotify.php?documentid=".$doc->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
+					else print "<a href='../out/out.DocumentNotify.php?documentid=".$doc->getID()."' class=\"btn btn-danger btn-mini btn-sm\">".getMLText("edit")."</a>";
 					print "</td>\n";
 					echo $this->documentListRowEnd($doc);
 				}
@@ -156,9 +156,9 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->rowStart();
 		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_folder_notify"));
-		$this->contentContainerStart();
 
 		print "<form class=\"form-horizontal\" method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">";
+		$this->contentContainerStart();
 		$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READ));
 		$this->formField(
 			getMLText("include_subdirectories"),
@@ -178,21 +178,21 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 				'value'=>1
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_document_notify"));
-		$this->contentContainerStart();
 		print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=document&action=add\" name=\"form2\">";
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
+		$this->contentContainerStart();
 		$this->formField(getMLText("choose_target_document"), $this->getDocumentChooserHtml("form2"));
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->rowEnd();
 

views/bootstrap/class.MoveDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for MoveDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_MoveDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.MoveFolder.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for MoveFolder view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_MoveFolder extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.MyDocuments.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_MyDocuments extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.ObjectCheck.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 
 	function tree($dms, $folder, $previewer, $repair, $path=':', $indent='') { /* {{{ */
 		global $user;

views/bootstrap/class.OpensearchDesc.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for OpensearchDesc view
@@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2010-2018 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_OpensearchDesc extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_OpensearchDesc extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.OverrideContentStatus.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for OverrideContentStatus view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_OverrideContentStatus extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_OverrideContentStatus extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.PasswordForgotten.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for PasswordForgotten view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_PasswordForgotten extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_PasswordForgotten extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -72,15 +72,13 @@ document.form1.email.focus();
 		$this->pageNavigation(getMLText("password_forgotten"));
 ?>
 
-<?php $this->contentContainerStart(); ?>
 <form class="form-horizontal" action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1">
 <?php
 		if ($referrer) {
 			echo "<input type='hidden' name='referuri' value='".$referrer."'/>";
 		}
-?>
+		$this->infoMsg(getMLText("password_forgotten_text"));
-  <p><?php printMLText("password_forgotten_text"); ?></p>
+		$this->contentContainerStart();
-<?php
 		$this->formField(
 			getMLText("user_login"),
 			array(
@@ -105,10 +103,10 @@ document.form1.email.focus();
 				'required'=>true
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_password_forgotten'));
 ?>
 </form>
-<?php $this->contentContainerEnd(); ?>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
 <?php
 		$this->contentEnd();

views/bootstrap/class.PasswordSend.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for PasswordSend view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_PasswordSend extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_PasswordSend extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$referrer = $this->params['referrer'];
@@ -38,12 +38,10 @@ class SeedDMS_View_PasswordSend extends SeedDMS_Bootstrap_Style {
 		$this->globalBanner();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("password_send"));
-?>
 
-<?php $this->contentContainerStart(); ?>
+		$this->infoMsg(getMLText('password_send_text'));
-<?php printMLText('password_send_text'); ?>
+?>
-<?php $this->contentContainerEnd(); ?>
+<p><a class="btn btn-primary" href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
-<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
 <?php
 		$this->contentEnd();
 		$this->htmlEndPage();

views/bootstrap/class.RemoveArchive.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveArchive view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveArchive extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveArchive extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -41,17 +41,15 @@ class SeedDMS_View_RemoveArchive extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("backup_remove"));
-		$this->contentContainerStart();
 
+		$this->warningMsg(getMLText("confirm_rm_backup", array ("arkname" => htmlspecialchars($arkname))));
 ?>
 <form action="../op/op.RemoveArchive.php" name="form1" method="post">
 	<input type="hidden" name="arkname" value="<?php echo htmlspecialchars($arkname); ?>">
   <?php echo createHiddenFieldWithKey('removearchive'); ?>
-	<p><?php printMLText("confirm_rm_backup", array ("arkname" => htmlspecialchars($arkname)));?></p>
+	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("backup_remove");?></button></p>
-	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("backup_remove");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveDocument extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		parent::show();

views/bootstrap/class.RemoveDocumentFile.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveDocumentFile view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -43,18 +43,15 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_file"));
-		$this->contentContainerStart();
+		$this->warningMsg(getMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName()))));
-
 ?>
 <form action="../op/op.RemoveDocumentFile.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('removedocumentfile'); ?>
 	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
-	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
+	<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button>
-	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveDump.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveDump view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveDump extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveDump extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -41,16 +41,16 @@ class SeedDMS_View_RemoveDump extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("dump_remove"));
-		$this->contentContainerStart();
 ?>
 <form action="../op/op.RemoveDump.php" name="form1" method="post">
 	<input type="Hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
-  <?php echo createHiddenFieldWithKey('removedump'); ?>
+<?php
-	<p><?php printMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname)));?></p>
+	 	echo createHiddenFieldWithKey('removedump');
-	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("dump_remove");?></button></p>
+		$this->warningMsg(getMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname))));
+?>
+	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("dump_remove");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveFolder.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveFolder view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveFolder extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.RemoveGroup.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveGroup view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveGroup extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveGroup extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -41,20 +41,17 @@ class SeedDMS_View_RemoveGroup extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("rm_group"));
-		$this->contentContainerStart();
-
 ?>
 <form action="../op/op.GroupMgr.php" name="form1" method="post">
 <input type="hidden" name="groupid" value="<?php print $group->getID();?>">
 <input type="hidden" name="action" value="removegroup">
 <?php echo createHiddenFieldWithKey('removegroup'); ?>
-<p>
+<?php
-<?php printMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName())));?>
+		$this->warningMsg(getMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName()))));
-</p>
+?>
-<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_group");?></button></p>
+<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_group");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveLog.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveLog view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveLog extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -42,7 +42,6 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("rm_file"));
-		$this->contentContainerStart();
 ?>
 <form action="../op/op.RemoveLog.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('removelog'); ?>
@@ -52,12 +51,11 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 			echo "<input type=\"hidden\" name=\"lognames[]\" value=\"".$logname."\">\n";
 
 		}
+		$this->warningMsg(getMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames))));
 ?>
-	<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
 	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveUser.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveUser view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveUser extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -43,11 +43,7 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("rm_user"));
 
-?>
+		$this->warningMsg(getMLText("confirm_rm_user", array ("username" => htmlspecialchars($rmuser->getFullName()))));
-<div class="alert">
-<?php printMLText("confirm_rm_user", array ("username" => htmlspecialchars($rmuser->getFullName())));?>
-</div>
-<?php
 		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.UsrMgr.php" name="form1" method="post">
@@ -73,16 +69,17 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
 </select>
 	</div>
 </div>
-
+<?php
+		$this->contentContainerEnd();
+?>
 <div class="control-group">
 	<div class="controls">
-		<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_user");?></button>
+		<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_user");?></button>
 	</div>
 </div>
 
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveUserFromProcesses.php

@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveUserFromProcesses view
@@ -25,7 +25,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2017 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -38,12 +38,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("rm_user_from_processes"));
 
-?>
+		$this->warningMsg(getMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName()))));
-<div class="alert">
-<?php printMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName())));?>
-</div>
-<?php
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.UsrMgr.php" name="form1" method="post">
 <input type="hidden" name="userid" value="<?php print $rmuser->getID();?>">
@@ -51,6 +46,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <?php echo createHiddenFieldWithKey('removefromprocesses'); ?>
 
 <?php
+		$this->contentContainerStart();
 		$reviewStatus = $rmuser->getReviewStatus();
 		$tmpr = array();
 		$cr = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
@@ -201,12 +197,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 			)
 		);
 		 */
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('rm_user_from_processes'));
 ?>
 
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.RemoveVersion.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveVersion view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveVersion extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
 	<p><?php printMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion()));?></p>
-  <p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
+  <p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.RemoveWorkflow.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Removeorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveWorkflow extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -57,7 +57,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->columnStart(8);
 ?>
 	<div id="workflowgraph">
-	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="661" style="border: 1px solid #AAA;"></iframe>
+	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="670" style="border: 1px solid #AAA;"></iframe>
 	</div>
 <?php
 		$this->columnEnd();

views/bootstrap/class.RemoveWorkflowFromDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Removeorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -73,7 +73,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 	<?php echo createHiddenFieldWithKey('removeworkflowfromdocument'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 <?php
 		$this->columnEnd();

views/bootstrap/class.ReturnFromSubWorkflow.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ReturnFromSubWorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ReturnFromSubWorkflow extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ReturnFromSubWorkflow extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -112,7 +112,7 @@ $(document).ready(function() {
 	<?php if($transition) { ?>
 	<input type='hidden' name='transition' value='<?php echo $transition->getID(); ?>'/>
 	<?php } ?>
-	<input type='submit' class="btn" value='<?php printMLText("return_from_subworkflow"); ?>'/>
+	<input type='submit' class="btn btn-primary" value='<?php printMLText("return_from_subworkflow"); ?>'/>
 	</td></tr></table>
 	</form>
 <?php
@@ -120,7 +120,7 @@ $(document).ready(function() {
 		$this->columnStart(4);
 ?>
 	<div id="workflowgraph">
-	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
+	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="670" style="border: 1px solid #AAA;"></iframe>
 	<h4>Workflow</h4>
 <?php
 		$this->columnEnd();
@@ -128,8 +128,7 @@ $(document).ready(function() {
 		$this->contentContainerEnd();
 
 		if($wkflog) {
-			$this->contentContainerStart();
+			echo "<table class=\"table table-condensed table-sm\">";
-			echo "<table class=\"table-condensed\">";
 			echo "<tr><th>".getMLText('action')."</th><th>Start state</th><th>End state</th><th>".getMLText('date')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>";
 			foreach($wkflog as $entry) {
 				echo "<tr>";
@@ -142,7 +141,6 @@ $(document).ready(function() {
 				echo "</tr>";
 			}
 			echo "</table>\n";
-			$this->contentContainerEnd();
 		}
 
 		$this->contentEnd();

views/bootstrap/class.ReviewDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ReviewDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ReviewDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ReviewDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -109,7 +109,6 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_review"));
-		$this->contentContainerStart();
 
 		// Display the Review form.
 		$reviewtype = ($reviewStatus['type'] == 0) ? 'ind' : 'grp';
@@ -132,6 +131,8 @@ $(document).ready(function() {
 	<form class="form-horizontal" method="post" action="../op/op.ReviewDocument.php" id="form<?= $reviewtype ?>" name="form<?= $reviewtype ?>" enctype="multipart/form-data">
 	<?php echo createHiddenFieldWithKey('reviewdocument'); ?>
 <?php
+		$this->contentContainerStart();
+
 		$this->formField(
 			getMLText("comment"),
 			array(
@@ -158,6 +159,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_review'), $reviewtype.'Review');
 ?>
 	<input type='hidden' name='reviewType' value='<?= $reviewtype ?>'/>
@@ -168,8 +170,6 @@ $(document).ready(function() {
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.ReviewSummary.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ReviewSummary extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.RewindWorkflow.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Rewindorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RewindWorkflow extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -73,7 +73,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 	<?php echo createHiddenFieldWithKey('rewindworkflow'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<button type='submit' class="btn"><i class="fa fa-refresh"></i> <?php printMLText("rewind_workflow"); ?></button>
+	<button type='submit' class="btn btn-danger"><i class="fa fa-refresh"></i> <?php printMLText("rewind_workflow"); ?></button>
 	</form>
 <?php
 		$this->columnEnd();
@@ -88,8 +88,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 
 		if($wkflog) {
-			$this->contentContainerStart();
+			echo "<table class=\"table table-condensed table-sm\">";
-			echo "<table class=\"table-condensed\">";
 			echo "<tr><th>".getMLText('action')."</th><th>Start state</th><th>End state</th><th>".getMLText('date')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>";
 			foreach($wkflog as $entry) {
 				echo "<tr>";
@@ -102,7 +101,6 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 				echo "</tr>";
 			}
 			echo "</table>\n";
-			$this->contentContainerEnd();
 		}
 
 		$this->contentEnd();

views/bootstrap/class.RunSubWorkflow.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RunSubWorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RunSubWorkflow extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -76,7 +76,7 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
 	<input type='hidden' name='subworkflow' value='<?php echo $subworkflow->getID(); ?>'/>
-	<input type='submit' class="btn" value='<?php printMLText("run_subworkflow"); ?>'/>
+	<input type='submit' class="btn btn-primary" value='<?php printMLText("run_subworkflow"); ?>'/>
 	</td></tr></table>
 	</form>
 <?php
@@ -92,8 +92,7 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 
 		if($wkflog) {
-			$this->contentContainerStart();
+			echo "<table class=\"table table-condensed table-sm\">";
-			echo "<table class=\"table-condensed\">";
 			echo "<tr><th>".getMLText('action')."</th><th>Start state</th><th>End state</th><th>".getMLText('date')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>";
 			foreach($wkflog as $entry) {
 				echo "<tr>";
@@ -106,7 +105,6 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 				echo "</tr>";
 			}
 			echo "</table>\n";
-			$this->contentContainerEnd();
 		}
 
 		$this->contentEnd();

views/bootstrap/class.Search.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Search extends SeedDMS_Theme_Style {
 
 	/**
 	 * Mark search query sting in a given string
@@ -173,11 +173,11 @@ function typeahead() { /* {{{ */
 //echo "<pre>";print_r($_GET);echo "</pre>";
 ?>
   <ul class="nav nav-tabs" id="searchtab">
-	  <li <?php echo ($fullsearch == false) ? 'class="active"' : ''; ?>><a data-target="#database" data-toggle="tab"><?php printMLText('databasesearch'); ?></a></li>
+	  <li class="nav-item <?php echo ($fullsearch == false) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == false) ? 'active' : ''; ?>" data-target="#database" data-toggle="tab"><?php printMLText('databasesearch'); ?></a></li>
 <?php
 		if($enablefullsearch) {
 ?>
-	  <li <?php echo ($fullsearch == true) ? 'class="active"' : ''; ?>><a data-target="#fulltext" data-toggle="tab"><?php printMLText('fullsearch'); ?></a></li>
+	  <li class="nav-item <?php echo ($fullsearch == true) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == true) ? 'active' : ''; ?>" data-target="#fulltext" data-toggle="tab"><?php printMLText('fullsearch'); ?></a></li>
 <?php
 		}
 ?>
@@ -229,7 +229,7 @@ function typeahead() { /* {{{ */
 <tr>
 <td><?php printMLText("search_resultmode");?>:</td>
 <td>
-<select name="resultmode">
+<select name="resultmode" class="form-control">
 <option value="3" <?php echo ($resultmode=='3') ? "selected" : ""; ?>><?php printMLText("search_resultmode_both");?>
 <option value="2"<?php echo ($resultmode=='2') ? "selected" : ""; ?>><?php printMLText("search_mode_folders");?>
 <option value="1"<?php echo ($resultmode=='1') ? "selected" : ""; ?>><?php printMLText("search_mode_documents");?>
@@ -479,7 +479,7 @@ function typeahead() { /* {{{ */
 <tr>
 <td><?php printMLText("search_query");?>:</td>
 <td>
-<input type="text" name="query" value="<?php echo htmlspecialchars($this->query); ?>" />
+<input type="text" class="form-control" name="query" value="<?php echo htmlspecialchars($this->query); ?>" />
 <!--
 <select name="mode">
 <option value="1" selected><?php printMLText("search_mode_and");?>

views/bootstrap/class.SendLoginData.php

@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SendLoginData view
@@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SendLoginData extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.Session.php

@@ -47,38 +47,24 @@ class SeedDMS_View_Session extends SeedDMS_Theme_Style {
 		$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
 		$sessions = $sessionmgr->getLastAccessedSessions(date('Y-m-d H:i:s', time()-3600));
 		if(!$sessions)
-			return '';
+			return;
 
 		if ($user->isGuest() || count($sessions) == 0) {
-			return '';
+			return;
 		}
 
-		/* $hasuser will be set to true when at least one of the logged in users
-		 * is visible and not hidden in user lists.
-		 */
 		$c = 0;
-		$ucontent = '';
+		$menuitems['session'] = array('label'=>'', 'children'=>array());
 		foreach($sessions as $session) {
 			if($sesuser = $dms->getUser($session->getUser()))
 				if(!$sesuser->isHidden()) {
 					$c++;
-					$hasuser = true;
+					$menuitems['session']['children'][] = array('label'=>'<i class="fa fa-user"></i> '.htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess()));
-					$ucontent .= "    <li><a _href=\"\"><i class=\"fa fa-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
 				}
 		}
 		if($c) {
-			$content = '';
+			$menuitems['session']['label'] = getMLText('sessions')." (".$c.")";
-			$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
+			self::showNavigationBar($menuitems, array('right'=>true));
-			$content .= "    <li class=\"dropdown add-session-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
-			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-			$content .= $ucontent;
-			$content .= "     </ul>\n";
-			$content .= "    </li>\n";
-			$content .= "   </ul>\n";
-			echo $content;
-		} else {
-			return '';
 		}
 	} /* }}} */
 

views/bootstrap/class.SetExpires.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SetExpires view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SetExpires extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.SetReviewersApprovers.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SetReviewersApprovers view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -80,7 +80,6 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 
-<?php $this->contentContainerStart(); ?>
 
 <form action="../op/op.SetReviewersApprovers.php" method="post" name="form1">
 
@@ -88,6 +87,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 		if($workflowmode != 'traditional_only_approval') {
 ?>
 <?php $this->contentSubHeading(getMLText("update_reviewers"));?>
+<?php $this->contentContainerStart(); ?>
 
   <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
   <select class="chzn-select span9" name="indReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
@@ -196,7 +196,9 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 
+<?php $this->contentContainerEnd(); ?>
 <?php $this->contentSubHeading(getMLText("update_approvers"));?>
+<?php $this->contentContainerStart(); ?>
 
   <div class="cbSelectTitle cbSelectMargin"><?php printMLText("individuals")?>:</div>
   <select class="chzn-select span9" name="indApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
@@ -305,15 +307,15 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 				echo "</div>\n";
 			}
 		}
+		$this->contentContainerEnd();
 ?>
 <p>
 <input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
 <input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type="submit" class="btn" value="<?php printMLText("update");?>">
+<input type="submit" class="btn btn-primary" value="<?php printMLText("update");?>">
 </p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.SetWorkflow.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SetWorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SetWorkflow extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SetWorkflow extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$document = $this->params['document'];

views/bootstrap/class.Settings.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Settings view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 
 	protected function showPaneHeader($name, $title, $isactive) { /* {{{ */
 		echo '<li class="'.($isactive ? 'active' : '').'"><a data-target="#'.$name.'" data-toggle="tab">'.$title.'</a></li>'."\n";

views/bootstrap/class.Setup2Factor.php

@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include classes for 2-factor authentication
@@ -30,7 +30,7 @@ require "vendor/autoload.php";
  * @copyright  Copyright (C) 2016 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Setup2Factor extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Setup2Factor extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.Statistic.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Statistic view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Statistic extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Statistic extends SeedDMS_Theme_Style {
 		var $dms;
 		var $folder_count;
 		var $document_count;

views/bootstrap/class.SubstituteUser.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SubstituteUser view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SubstituteUser extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -98,7 +98,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
-				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText('substitute_user')."</a> ";
+				echo "<a class=\"btn btn-primary\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
 			echo "</td>";
 			echo "</tr>";

views/bootstrap/class.Tasks.php

@@ -157,6 +157,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 			return;
 		}
 
+		$menuitems = [];
+
 		$content = '';
 		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown\">\n";
@@ -172,6 +174,10 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 			$ct[] = count($tasks['rejected']);
 		$content .= implode('/', $ct);
 		$content .= ")";
+
+		$menuitems['tasks'] = array('label'=>getMLText('tasks')." (".implode('/', $ct).")");
+		$menuitems['tasks']['children'] = [];
+
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) {
 		$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -179,10 +185,14 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$subitems = [];
 		foreach($tasks['review'] as $t) {
 			$doc = $dms->getDocument($t['id']);
 			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
+			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
+		$menuitems['tasks']['children']['review'] = array('label'=>getMLText('documents_to_review'), 'children'=>$subitems);
+
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
@@ -190,10 +200,13 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$subitems = [];
 		foreach($tasks['approval'] as $t) {
 			$doc = $dms->getDocument($t['id']);
 			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
+			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
+		$menuitems['tasks']['children']['approval'] = array('label'=>getMLText('documents_to_approve'), 'children'=>$subitems);
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
@@ -201,10 +214,13 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$subitems = [];
 		foreach($tasks['workflow'] as $t) {
 			$doc = $dms->getDocument($t['id']);
 			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
+			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
+		$menuitems['tasks']['children']['workflow'] = array('label'=>getMLText('documents_to_trigger_workflow'), 'children'=>$subitems);
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
@@ -212,20 +228,26 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_rejected")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$subitems = [];
 		foreach($tasks['rejected'] as $t) {
 			$doc = $dms->getDocument($t['id']);
 			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
+			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
+		$menuitems['tasks']['children']['rejected'] = array('label'=>getMLText('documents_rejected'), 'children'=>$subitems);
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		$content .= "     </ul>\n";
+		$menuitems['tasks']['children']['divider'] = array('divider'=>true);
+		$menuitems['tasks']['children']['mydocuments'] = array('label'=>getMLText('my_documents'), 'href'=>'../out/out.MyDocuments.php');
 		}
 		$content .= "    </li>\n";
 		$content .= "   </ul>\n";
-		echo $content;
+		self::showNavigationBar($menuitems, array('right'=>true));
+		//echo $content;
 	} /* }}} */
 
 	/**

views/bootstrap/class.Timeline.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Timeline extends SeedDMS_Theme_Style {
 
 	function iteminfo() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -220,9 +220,9 @@ div.timeline-event-selected {
 			$to = time();
 		}
 
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
+		$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-locales.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("timeline"));
 		$this->globalNavigation();

views/bootstrap/class.TransferDocument.php

@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for TransferDocument view
@@ -25,7 +25,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2017 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_TransferDocument extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -67,9 +67,7 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
 				getMLText("transfer_to_user"),
 				$html
 			);
-			if($accessobject->check_controller_access('TransferDocument', array('action'=>'run'))) {
+			$this->formSubmit("<i class=\"fa fa-exchange\"></i> ".getMLText('transfer_document'));
-				$this->formSubmit("<i class=\"fa fa-exchange\"></i> ".getMLText('transfer_document'));
-			}
 			$this->contentContainerEnd();
 		} else {
 			$this->warningMsg('transfer_no_users');

views/bootstrap/class.TransferObjects.php

@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for TransferObjects view
@@ -25,7 +25,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2017 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_TransferObjects extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_TransferObjects extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.TriggerWorkflow.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for TriggerWorkflow view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_TriggerWorkflow extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_TriggerWorkflow extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.UpdateDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for UpdateDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_UpdateDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_UpdateDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];

views/bootstrap/class.UserDefaultKeywords.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for UserDefaultKeywords view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_UserDefaultKeywords extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_UserDefaultKeywords extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');

views/bootstrap/class.UserList.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for UserList view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_UserList extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

views/bootstrap/class.UsrMgr.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for UsrMgr view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_UsrMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$seluser = $this->params['seluser'];
@@ -94,7 +94,7 @@ $(document).ready( function() {
 			$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
 
 			$this->contentHeading(getMLText("user_info"));
-			echo "<table class=\"table table-condensed\">\n";
+			echo "<table class=\"table table-condensed table-sm\">\n";
 			echo "<tr><td>".getMLText('discspace')."</td><td>";
 			if($quota) {
 				$qt = $seluser->getQuota() ? $seluser->getQuota() : $quota;
@@ -175,27 +175,21 @@ $(document).ready( function() {
 		$enableemail = $this->params['enableemail'];
 
 		if($seluser) {
-?>
+			$button = array(
-<div class="btn-group">
+				'label'=>getMLText('action'),
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+				'menuitems'=>array(
-		<?php echo getMLText('action'); ?>
+				)
-    <span class="caret"></span>
+			);
-  </a>
-  <ul class="dropdown-menu">
-<?php
 			if(!in_array($seluser->getID(), $undeluserids)) {
-				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a><li>';
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_user"), 'link'=>'../out/out.RemoveUser.php?userid='.$seluser->getID());
 			}
-			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="fa fa-unlink"></i> '.getMLText("rm_user_from_processes").'</a></li>';
+			$button['menuitems'][] = array('label'=>'<i class="fa fa-unlink"></i> '.getMLText("rm_user_from_processes"), 'link'=>'../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID());
-			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="fa fa-share-square-o"></i> '.getMLText("transfer_objects").'</a></li>';
+			$button['menuitems'][] = array('label'=>'<i class="fa fa-share-square-o"></i> '.getMLText("transfer_objects"), 'link'=>'../out/out.TransferObjects.php?userid='.$seluser->getID());
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
+				$button['menuitems'][] = array('label'=>'<i class=\"fa fa-exchange\"></i> '.getMLText("substitute_user"), 'link'=>'../op/op.SubstituteUser.php?userid='.$seluser->getID());
 			if($enableemail)
-				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="fa fa-envelope-o"></i> '.getMLText("send_login_data").'</a></li>';
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-envelope-o"></i> '.getMLText("send_login_data"), 'link'=>'../out/out.SendLoginData.php?userid='.$seluser->getID());
-?>
+			self::showButtonwithMenu($button);
-	</ul>
-</div>
-<?php
 		}
 	} /* }}} */
 

views/bootstrap/class.UsrView.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for UsrView view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_UsrView extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -45,7 +45,7 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
 
 		$this->contentHeading(getMLText("users"));
 
-		echo "<table class=\"table table-condensed\">\n";
+		echo "<table class=\"table table-condensed table-sm\">\n";
 		echo "<thead>\n<tr>\n";
 		if($enableuserimage) echo "<th></th>\n";
 		echo "<th>".getMLText("name")."</th>\n";

views/bootstrap/class.ViewDocument.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 
 	protected function getAccessModeText($defMode) { /* {{{ */
 		switch($defMode) {
@@ -202,12 +202,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			echo $txt;
 		else {
 		$this->contentHeading(getMLText("document_infos"));
-		$this->contentContainerStart();
+//		$this->contentContainerStart();
 		$txt = $this->callHook('preDocumentInfos', $document);
 		if(is_string($txt))
 			echo $txt;
 ?>
-		<table class="table-condensed">
+		<table class="table table-condensed table-sm">
 <?php
 		if($user->isAdmin()) {
 			echo "<tr>";
@@ -353,7 +353,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$txt = $this->callHook('postDocumentInfos', $document);
 		if(is_string($txt))
 			echo $txt;
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
 		}
 	} /* }}} */
 
@@ -471,9 +471,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$versions = $document->getContent();
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
+		$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-locales.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -545,33 +545,33 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			echo $txt;
 ?>
     <ul class="nav nav-tabs" id="docinfotab">
-		  <li class="<?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
+		  <li class="nav-item <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'docinfo') echo 'active'; ?>" data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
 			<?php if (count($versions)>1) { ?>
-		  <li class="<?php if($currenttab == 'previous') echo 'active'; ?>"><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
+		  <li class="nav-item <?php if($currenttab == 'previous') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'previous') echo 'active'; ?>" data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
 <?php
 			}
 			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 				if((is_array($reviewStatus) && count($reviewStatus)>0) ||
 					(is_array($approvalStatus) && count($approvalStatus)>0)) {
 ?>
-		  <li class="<?php if($currenttab == 'revapp') echo 'active'; ?>"><a data-target="#revapp" data-toggle="tab"><?php if($workflowmode == 'traditional') echo getMLText('reviewers')."/"; echo getMLText('approvers'); ?></a></li>
+			<li class="nav-item <?php if($currenttab == 'revapp') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'revapp') echo 'active'; ?>" data-target="#revapp" data-toggle="tab"><?php if($workflowmode == 'traditional') echo getMLText('reviewers')."/"; echo getMLText('approvers'); ?></a></li>
 <?php
 				}
 			} elseif($workflowmode == 'advanced') {
 				if($workflow) {
 ?>
-		  <li class="<?php if($currenttab == 'workflow') echo 'active'; ?>"><a data-target="#workflow" data-toggle="tab"><?php echo getMLText('workflow'); ?></a></li>
+			<li class="nav-item <?php if($currenttab == 'workflow') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'workflow') echo 'active'; ?>" data-target="#workflow" data-toggle="tab"><?php echo getMLText('workflow'); ?></a></li>
 <?php
 				}
 			}
 ?>
-		  <li class="<?php if($currenttab == 'attachments') echo 'active'; ?>"><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
+			<li class="nav-item <?php if($currenttab == 'attachments') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'attachments') echo 'active'; ?>" data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
-			<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links) || count($reverselinks)) ? " (".count($links)."/".count($reverselinks).")" : ""; ?></a></li>
+			<li class="nav-item <?php if($currenttab == 'links') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'links') echo 'active'; ?>" data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links) || count($reverselinks)) ? " (".count($links)."/".count($reverselinks).")" : ""; ?></a></li>
 <?php
 			$tabs = $this->callHook('extraTabs', $document);
 			if($tabs) {
 				foreach($tabs as $tabid=>$tab) {
-					echo '<li class="'.($currenttab == $tabid ? 'active' : '').'"><a data-target="#'.$tabid.'" data-toggle="tab">'.$tab['title'].'</a></li>';
+					echo '<li class="nav-item '.($currenttab == $tabid ? 'active' : '').'"><a class="nav-link '.($currenttab == $tabid ? 'active' : '').'" data-target="#'.$tabid.'" data-toggle="tab">'.$tab['title'].'</a></li>';
 				}
 			}
 ?>
@@ -739,7 +739,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentHeading(getMLText("status"));
 			$this->contentContainerStart();
 			$statuslog = $latestContent->getStatusLog();
-			echo "<table class=\"table table-condensed\"><thead>";
+			echo "<table class=\"table table-condensed table-sm\"><thead>";
 			echo "<th>".getMLText('date')."</th><th>".getMLText('status')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
 			echo "</thead><tbody>";
 			foreach($statuslog as $entry) {
@@ -756,7 +756,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			if($wkflogs) {
 				$this->contentHeading(getMLText("workflow_summary"));
 				$this->contentContainerStart();
-				echo "<table class=\"table table-condensed\"><thead>";
+				echo "<table class=\"table table-condensed table-sm\"><thead>";
 				echo "<th>".getMLText('date')."</th><th>".getMLText('action')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
 				echo "</thead><tbody>";
 				foreach($wkflogs as $wkflog) {
@@ -791,7 +791,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->columnStart(6);
 //		$this->contentContainerStart();
 			print "<legend>".getMLText('reviewers')."</legend>";
-			print "<table class=\"table table-condensed\">\n";
+			print "<table class=\"table table-condensed table-sm\">\n";
 
 			print "<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
@@ -866,7 +866,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if($class)
 							echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
 						print getReviewStatusText($r["status"])."</td>\n";
-					print "<td><ul class=\"unstyled\">";
+					print "<td><ul class=\"actions unstyled\">";
 					if($accesserr)
 							echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 	
@@ -892,7 +892,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->columnStart(6);
 //		$this->contentContainerStart();
 		print "<legend>".getMLText('approvers')."</legend>";
-		print "<table class=\"table table-condensed\">\n";
+		print "<table class=\"table table-condensed table-sm\">\n";
 		if (is_array($approvalStatus) && count($approvalStatus)>0) {
 
 			print "<tr>\n";
@@ -968,7 +968,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if($class)
 							echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
 						print getApprovalStatusText($a["status"])."</td>\n";
-					print "<td><ul class=\"unstyled\">";
+					print "<td><ul class=\"actions unstyled\">";
 					if($accesserr)
 							echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 	
@@ -1046,7 +1046,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				echo "<p>Sub workflow of '".htmlspecialchars($parentworkflow->getName())."'</p>";
 			}
 			echo "<h5>".getMLText('current_state').": ".htmlspecialchars($workflowstate->getName())."</h5>";
-			echo "<table class=\"table table-condensed\">\n";
+			echo "<table class=\"table table-condensed table-sm\">\n";
 			echo "<tr>";
 			echo "<td>".getMLText('next_state').":</td>";
 			foreach($transitions as $transition) {
@@ -1156,15 +1156,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 				}
 				if($subworkflows) {
-					echo "<form action=\"../out/out.RunSubWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" />";
+					echo "<form class=\"form-inline\" action=\"../out/out.RunSubWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" />";
-					echo "<select name=\"subworkflow\">";
+					echo "<select name=\"subworkflow\" class=\"form-control\">";
 					foreach($subworkflows as $subworkflow) {
 						echo "<option value=\"".$subworkflow->getID()."\">".$subworkflow->getName()."</option>";
 					}
 					echo "</select>";
 					echo "<label class=\"inline\">";
 					echo "<input type=\"submit\" class=\"btn btn-primary\" value=\"".getMLText('run_subworkflow')."\" />";
-					echo "</lable>";
+					echo "</label>";
 					echo "</form>";
 				}
 			}
@@ -1274,7 +1274,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "</a>\n";
 				}
 				print "</td>\n";
-				print "<td><ul class=\"unstyled\">\n";
+				print "<td><ul class=\"properties unstyled\">\n";
 				print "<li>".htmlspecialchars($version->getOriginalFileName())."</li>\n";
 				print "<li>".getMLText('version').": ".$version->getVersion()."</li>\n";
 				if ($file_exists) print "<li>". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."</li>";
@@ -1434,7 +1434,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 		if (count($links) > 0) {
 
-			print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
+			print "<table id=\"viewfolder-table\" class=\"table table-condensed table-sm table-hover\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";	
 			print "<th>".getMLText("name")."</th>\n";
@@ -1460,7 +1460,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-danger btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($targetDoc);
 			}
@@ -1469,12 +1469,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		else $this->infoMsg(getMLText("no_linked_files"));
 
 		if (!$user->isGuest()){
-			$this->contentContainerStart();
 ?>
 			<br>
 			<form action="../op/op.AddDocumentLink.php" name="form1" class="form-horizontal">
 			<input type="hidden" name="documentid" value="<?php print $documentid;?>">
 			<?php echo createHiddenFieldWithKey('adddocumentlink'); ?>
+			<?php $this->contentContainerStart(); ?>
 			<?php $this->formField(getMLText("add_document_link"), $this->getDocumentChooserHtml("form1")); ?>
 			<?php
 			if ($document->getAccessMode($user) >= M_READWRITE) {
@@ -1489,18 +1489,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					)
 				);
 			}
+			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 			</form>
 <?php
-			$this->contentContainerEnd();
 		}
 
 		if (count($reverselinks) > 0) {
 			$this->contentHeading(getMLText("reverse_links"));
 //			$this->contentContainerStart();
 
-			print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
+			print "<table id=\"viewfolder-table\" class=\"table table-condensed table-sm table-hover\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";	
 			print "<th>".getMLText("name")."</th>\n";

views/bootstrap/class.ViewFolder.php

@@ -239,11 +239,11 @@ $('body').on('click', '.order-btn', function(ev) {
 
 			$owner = $folder->getOwner();
 			$this->contentHeading(getMLText("folder_infos"));
-			$this->contentContainerStart();
+//			$this->contentContainerStart();
 			$txt = $this->callHook('preFolderInfos', $folder);
 			if(is_string($txt))
 				echo $txt;
-			echo "<table class=\"table-condensed\">\n";
+			echo "<table class=\"table table-condensed table-sm\">\n";
 			if($user->isAdmin()) {
 				echo "<tr>";
 				echo "<td>".getMLText("id").":</td>\n";
@@ -323,7 +323,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			$txt = $this->callHook('postFolderInfos', $folder);
 			if(is_string($txt))
 				echo $txt;
-			$this->contentContainerEnd();
+//			$this->contentContainerEnd();
 		}
 	} /* }}} */
 
@@ -371,7 +371,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			if(is_string($txt))
 				echo $txt;
 			else {
-				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
+				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-sm table-hover\">";
 				print "<thead>\n<tr>\n";
 				print "<th>".($parent ? '<button class="btn btn-mini btn-secondary" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";	
 				print "<th>".getMLText("name");
@@ -459,7 +459,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		$this->contentHeading(getMLText("dropupload"), true);
 		if ($folder->getAccessMode($user) >= M_READWRITE) {
 ?>
-<div id="draganddrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
+<div id="draganddrophandler" class="well alert alert-warning" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey(''); ?>"><?php printMLText('drop_files_here'); ?></div>
 <?php
 		} else {
 			$this->errorMsg(getMLText('access_denied'));

views/bootstrap/class.WorkflowActionsMgr.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for WorkspaceActionsMgr view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_WorkflowActionsMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_WorkflowActionsMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -76,7 +76,7 @@ $(document).ready( function() {
 			if($selworkflowaction->isUsed()) {
 				$transitions = $selworkflowaction->getTransitions();
 				if($transitions) {
-					echo "<table class=\"table table-condensed\">";
+					echo "<table class=\"table table-condensed table-sm\">";
 					echo "<thead><tr><th>".getMLText('workflow')."</th><th>".getMLText('previous_state')."</th><th>".getMLText('next_state')."</th></tr></thead>\n";
 					echo "<tbody>";
 					foreach($transitions as $transition) {
@@ -131,7 +131,6 @@ $(document).ready( function() {
 			}
 		}
 ?>
-	<?php	$this->contentContainerStart(); ?>
 <form action="../op/op.WorkflowActionsMgr.php" method="post" class="form-horizontal">
 <?php
 		if($action) {
@@ -146,6 +145,7 @@ $(document).ready( function() {
 			<input type="hidden" name="action" value="addworkflowaction">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("workflow_action_name"),
 			array(
@@ -156,10 +156,10 @@ $(document).ready( function() {
 				'value'=>($action ? htmlspecialchars($action->getName()) : '')
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
-	<?php	$this->contentContainerEnd(); ?>
 <?php
 	} /* }}} */
 

views/bootstrap/class.WorkflowGraph.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for WorkspaceMgr view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_WorkflowGraph extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$this->workflow = $this->params['workflow'];
@@ -318,13 +318,13 @@ $(document).ready(function() {
 			'<script type="text/javascript" src="../views/bootstrap/vendors/cytoscape/cytoscape-grid-guide.js"></script>'."\n");
 		$this->htmlAddHeader('
 <style type="text/css">
-body {padding: 0px;}
+body {padding: 0px;margin-bottom:0px;}
 div.buttons {float: right; padding-left: 4px; height: 100px; width: 120px; margin-right: 5px;}
 div.buttons button {margin: 3px; _float: right;}
 div.buttons #zoom {margin: 3px; _float: right;}
 #legend {display: inline-block; margin-left: 10px;}
-#preview {height: 115px; background: #f5f5f5; border-top: 1px solid #e3e3e3;}
+#preview {height: 122px; background: #f5f5f5; border-top: 1px solid #e3e3e3;}
-#preview img {float: left;border: 1px solid #bbb; background: #fff; min-height: 100px; height: 100px; _width: 100px; padding: 3px; margin: 3px;}
+#preview img {float: left;border: 1px solid #bbb; background: #fff; min-height: 115px; height: 115px; _width: 100px; padding: 3px; margin: 3px;}
 </style>
 ', 'css');
 		$this->htmlStartPage(getMLText("admin_tools"));
@@ -339,11 +339,11 @@ div.buttons #zoom {margin: 3px; _float: right;}
 		<i class="fa fa-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
 		<i class="fa fa-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
 		<i class="fa fa-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
-		<i class="fa fa-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
+		<i class="fa fa-square workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
 	</div>
 	<div class="buttons">
-		<div id="zoom"><button class="btn btn-mini btn-secondary">Zoom</button></div>
+		<div id="zoom"><button class="btn btn-mini btn-secondary btn-sm">Zoom</button></div>
-		<button class="btn btn-mini" id="setlayout" data-layout="cose"><?php printMLText('redraw'); ?></button>
+		<button class="btn btn-secondary btn-mini btn-sm" id="setlayout" data-layout="cose"><?php printMLText('redraw'); ?></button>
 	</div>
 </div>
 <?php

views/bootstrap/class.WorkflowMgr.php

@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for WorkspaceMgr view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_WorkflowMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_WorkflowMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -75,7 +75,7 @@ $(document).ready(function() {
 		$selworkflow = $this->params['selworkflow'];
 		if($selworkflow && $selworkflow->getTransitions()) { ?>
 <div id="workflowgraph">
-<iframe src="out.WorkflowGraph.php?workflow=<?php echo $selworkflow->getID(); ?>" width="100%" height="661" style="border: 1px solid #e3e3e3; border-radius: 4px; margin: -1px;"></iframe>
+<iframe src="out.WorkflowGraph.php?workflow=<?php echo $selworkflow->getID(); ?>" width="100%" height="670" style="border: 1px solid #e3e3e3; border-radius: 4px; margin: -1px;"></iframe>
 </div>
 <?php }
 	} /* }}} */
@@ -88,21 +88,15 @@ $(document).ready(function() {
 		$workflowstates = $this->params['allworkflowstates'];
 
 		if($selworkflow && !$selworkflow->isUsed()) {
-?>
+			$button = array(
-<div class="btn-group">
+				'label'=>getMLText('action'),
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+				'menuitems'=>array(
-		<?php echo getMLText('action'); ?>
+				)
-    <span class="caret"></span>
+			);
-  </a>
-  <ul class="dropdown-menu">
-<?php
 			if(!$selworkflow->isUsed()) {
-				echo '<li><a href="../out/out.RemoveWorkflow.php?workflowid='.$selworkflow->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow").'</a><li>';
+				$button['menuitems'][] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_workflow"), 'link'=>'../out/out.RemoveWorkflow.php?workflowid='.$selworkflow->getID());
 			}
-?>
+			self::showButtonwithMenu($button);
-	</ul>
-</div>
-<?php
 		}
 	} /* }}} */
 
@@ -247,7 +241,7 @@ $(document).ready(function() {
   <?php echo createHiddenFieldWithKey('removetransitionfromworkflow'); ?>
 	<input type="hidden" name="workflow" value="<?php print $workflow->getID();?>">
 	<input type="hidden" name="transition" value="<?php print $transition->getID(); ?>">
-	<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
+	<button type="submit" class="btn btn-mini btn-danger btn-sm"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 				echo "</td>";
@@ -261,13 +255,13 @@ $(document).ready(function() {
 		echo "<table class=\"table table-condensed\"><thead></thead><tbody>";
 			echo "<tr>";
 			echo "<td>";
-			echo "<select name=\"state\">";
+			echo "<select name=\"state\" class=\"form-control\">";
 			$states = $dms->getAllWorkflowStates();
 			foreach($states as $state) {
 				echo "<option value=\"".$state->getID()."\">".htmlspecialchars($state->getName())."</option>";
 			}
 			echo "</select><br />";
-			echo "<select name=\"nextstate\">";
+			echo "<select name=\"nextstate\" class=\"form-control\">";
 			$states = $dms->getAllWorkflowStates();
 			foreach($states as $state) {
 				echo "<option value=\"".$state->getID()."\">".htmlspecialchars($state->getName())."</option>";
@@ -275,7 +269,7 @@ $(document).ready(function() {
 			echo "</select>";
 			echo "</td>";
 			echo "<td>";
-			echo "<select name=\"action\">";
+			echo "<select name=\"action\" class=\"form-control\">";
 			foreach($actions as $action) {
 				echo "<option value=\"".$action->getID()."\">".htmlspecialchars($action->getName())."</option>";
 			}