gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 22:47:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-10-08 09:36:41 +02:00
commit 3b0ee6c3e3
43 changed files with 407 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
views/bootstrap/class.ApprovalSummary.php
View File

@ -62,8 +62,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
$this->globalNavigation();
$this->contentStart();
$this->pageNavigation(getMLText("my_documents"), "my_documents");
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span6\">\n";
$this->rowStart();
$this->columnStart(6);
$this->contentHeading(getMLText("approval_summary"));
// $this->contentContainerStart();
@ -117,8 +117,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
}
// $this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
$this->contentHeading(getMLText("group_approval_summary"));
// $this->contentContainerStart();
@ -161,8 +161,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
}
// $this->contentContainerEnd();
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

21
views/bootstrap/class.AttributeMgr.php
View File

@ -326,10 +326,9 @@ $(document).ready( function() {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("attrdef_management"));
$this->rowStart();
$this->columnStart(6);
?>
<div class="row-fluid">
<div class="span6">
<form class="form-horizontal">
<select class="chzn-select" id="selector" class="input-xlarge">
<option value="-1"><?php echo getMLText("choose_attrdef")?></option>
@ -399,19 +398,19 @@ $(document).ready( function() {
<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
<?php } ?>
</div>
<div class="span6">
<?php
$this->columnEnd();
$this->columnStart(6);
?>
<?php $this->contentContainerStart(); ?>
<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
<?php } ?>
<?php $this->contentContainerEnd(); ?>
</div>
</div>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

20
views/bootstrap/class.Bootstrap.php
View File

@ -1086,6 +1086,26 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
return;
} /* }}} */
function rowStart() { /* {{{ */
echo "<div class=\"row-fluid\">\n";
return;
} /* }}} */
function rowEnd() { /* {{{ */
echo "</div>\n";
return;
} /* }}} */
function columnStart($width=6) { /* {{{ */
echo "<div class=\"span".$width."\">\n";
return;
} /* }}} */
function columnEnd() { /* {{{ */
echo "</div>\n";
return;
} /* }}} */
function formField($title, $value, $params=array()) { /* {{{ */
if($title !== null) {
echo "<div class=\"control-group\">";

14
views/bootstrap/class.Calendar.php
View File

@ -392,15 +392,21 @@ $(document).ready(function() {
$this->globalNavigation();
$this->contentStart();
// $this->pageNavigation("", "calendar", array());
$this->rowStart();
$this->columnStart(8);
?>
<div class="row-fluid" style="margin-bottom: 20px;">
<div id="calendar" class="span8"></div>
<div id="docinfo" class="span4">
<div id="calendar" style="margin-bottom: 20px;"></div>
<?php
$this->columnEnd();
$this->columnStart(4);
?>
<div id="docinfo">
<div class="ajax iteminfo" data-view="Calendar" data-action="iteminfo" ></div>
<div class="ajax itemsperday" data-view="Calendar" data-action="itemsperday" ></div>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

25
views/bootstrap/class.Categories.php
View File

@ -97,7 +97,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="hidden" name="categoryid" value="<?php echo $selcat->getID()?>">
<input type="hidden" name="action" value="removecategory">
<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
</form>
<?php
}
@ -151,9 +151,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("global_document_categories"));
$this->rowStart();
$this->columnStart(6);
?>
<div class="row-fluid">
<div class="span6">
<form class="form-horizontal">
<select class="chzn-select" id="selector" class="input-xlarge">
<option value="-1"><?php echo getMLText("choose_category")?>
@ -167,16 +167,17 @@ $(document).ready( function() {
</form>
<div class="ajax" style="margin-bottom: 15px;" data-view="Categories" data-action="actionmenu" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="Categories" data-action="info" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
</div>
<div class="span6">
<?php $this->contentContainerStart(); ?>
<div class="ajax" data-view="Categories" data-action="form" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
<?php $this->contentContainerEnd(); ?>
</div>
</div>
<?php
$this->columnEnd();
$this->columnStart(6);
$this->contentContainerStart();
?>
<div class="ajax" data-view="Categories" data-action="form" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

20
views/bootstrap/class.Charts.php
View File

@ -206,21 +206,20 @@ $(document).ready( function() {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span3\">\n";
$this->rowStart();
$this->columnStart(3);
$this->contentHeading(getMLText("chart_selection"));
$this->contentContainerStart();
foreach(array('docsperuser', 'sizeperuser', 'docspermimetype', 'docspercategory', 'docsperstatus', 'docspermonth', 'docsaccumulated') as $atype) {
echo "<div><a href=\"?type=".$atype."\">".getMLText('chart_'.$atype.'_title')."</a></div>\n";
}
$this->contentContainerEnd();
echo "</div>\n";
$this->columnEnd();
if(in_array($type, array('docspermonth', 'docsaccumulated'))) {
echo "<div class=\"span9\">\n";
$this->columnStart(9);
} else {
echo "<div class=\"span6\">\n";
$this->columnStart(6);
}
$this->contentHeading(getMLText('chart_'.$type.'_title'));
$this->contentContainerStart();
@ -258,18 +257,17 @@ $(document).ready( function() {
break;
}
echo "</table>";
echo "</div>\n";
$this->columnEnd();
if(!in_array($type, array('docspermonth', 'docsaccumulated'))) {
echo "<div class=\"span3\">\n";
$this->columnStart(3);
$this->contentHeading(getMLText('legend'));
$this->contentContainerStart('', 'legend');
$this->contentContainerEnd();
echo "</div>\n";
$this->columnEnd();
}
echo "</div>\n";
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();

2
views/bootstrap/class.ClearCache.php
View File

@ -61,7 +61,7 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
}
?>
<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
</form>
<?php
$this->contentContainerEnd();

27
views/bootstrap/class.DefaultKeywords.php
View File

@ -128,7 +128,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="hidden" name="categoryid" value="<?php echo $selcategoryid?>">
<input type="hidden" name="action" value="removecategory">
<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
</form>
<?php
}
@ -175,7 +175,7 @@ $(document).ready( function() {
<input type="hidden" name="action" value="editcategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
</form>
</div>
</div>
@ -196,7 +196,7 @@ $(document).ready( function() {
<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
<input type="Hidden" name="action" value="editkeywords">
<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
<button class="btn" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
<button class="btn btn-primary" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
<!-- <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
</form>
<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
@ -204,7 +204,7 @@ $(document).ready( function() {
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
<input type="hidden" name="action" value="removekeywords">
<button class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
<button class="btn btn-danger" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
</form>
<br>
<?php } ?>
@ -240,9 +240,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("global_default_keywords"));
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal">
<select class="chzn-select" id="selector" class="input-xlarge">
<option value="-1"><?php echo getMLText("choose_category")?>
@ -264,16 +264,17 @@ $(document).ready( function() {
</select>
</form>
<div class="ajax" style="margin-bottom: 15px;" data-view="DefaultKeywords" data-action="actionmenu" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
</div>
<div class="span8">
<?php $this->contentContainerStart(); ?>
<?php
$this->columnEnd();
$this->columnStart(8);
$this->contentContainerStart();
?>
<div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
</div>
<?php $this->contentContainerEnd(); ?>
</div>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

25
views/bootstrap/class.DocumentAccess.php
View File

@ -93,8 +93,8 @@ $(document).ready( function() {
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("edit_document_access"));
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span4\">\n";
$this->rowStart();
$this->columnStart(4);
$this->contentContainerStart();
if ($user->isAdmin()) {
@ -149,8 +149,8 @@ $(document).ready( function() {
</p>
<?php
$this->contentContainerEnd();
echo "</div>";
echo "</div>";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
return;
@ -164,8 +164,8 @@ $(document).ready( function() {
</form>
<?php
$this->contentContainerEnd();
echo "</div>";
echo "<div class=\"span4\">";
$this->columnEnd();
$this->columnStart(4);
$this->contentContainerStart();
$accessList = $document->getAccessList();
@ -239,10 +239,8 @@ $(document).ready( function() {
</form>
<?php
$this->contentContainerEnd();
?>
</div>
<div class="span4">
<?php
$this->columnEnd();
$this->columnStart(4);
/* memorize users with access rights */
$memusers = array();
/* memorize groups with access rights */
@ -314,11 +312,8 @@ $(document).ready( function() {
print "</table><br>";
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

12
views/bootstrap/class.DocumentNotify.php
View File

@ -89,8 +89,8 @@ $(document).ready( function() {
$groupNotifyIDs[] = $groupNotify->getID();
}
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span6\">\n";
$this->rowStart();
$this->columnStart(6);
$this->contentContainerStart();
?>
@ -142,8 +142,8 @@ $(document).ready( function() {
</form>
<?php
$this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
print "<table class=\"table-condensed\">\n";
if ((count($notifyList["users"]) == 0) && (count($notifyList["groups"]) == 0)) {
print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
@ -186,8 +186,8 @@ $(document).ready( function() {
}
print "</table>\n";
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

82
views/bootstrap/class.DocumentVersionDetail.php
View File

@ -159,10 +159,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$this->globalNavigation($folder);
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->rowStart();
$this->columnStart(4);
$this->contentHeading(getMLText("document_infos"));
$this->contentContainerStart();
?>
@ -245,10 +243,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
<?php
$this->contentContainerEnd();
$this->preview();
?>
</div>
<div class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
// verify if file exists
$file_exists=file_exists($dms->contentDir . $version->getPath());
@ -353,8 +349,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$this->contentContainerEnd();
print "<div class=\"row-fluid\">";
print "<div class=\"span6\">";
$this->rowStart();
$this->columnStart(6);
if (is_array($reviewStatus) && count($reviewStatus)>0) { /* {{{ */
@ -407,8 +403,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</table>\n";
} /* }}} */
print "</div>\n";
print "<div class=\"span6\">";
$this->columnEnd();
$this->columnStart(6);
if (is_array($approvalStatus) && count($approvalStatus)>0) { /* {{{ */
@ -461,8 +457,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</table>\n";
} /* }}} */
print "</div>\n";
print "</div>\n";
$this->columnEnd();
$this->rowEnd();
/* Get attachments exclusively for this version, without those
* attached to the document
@ -582,54 +578,38 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</tbody>\n</table>\n";
$this->contentContainerEnd();
}
?>
<div class="row-fluid">
<?php
$this->rowStart();
/* Check for an existing review log, even if the workflowmode
* is set to traditional_only_approval. There may be old documents
* that still have a review log if the workflow mode has been
* changed afterwards.
*/
if($version->getReviewStatus(10)) {
?>
<div class="span6">
<?php $this->printProtocol($version, 'review'); ?>
</div>
<?php
$this->columnStart(6);
$this->printProtocol($version, 'review');
$this->columnEnd();
}
if($version->getApprovalStatus(10)) {
?>
<div class="span6">
<?php $this->printProtocol($version, 'approval'); ?>
</div>
<?php
$this->columnStart(6);
$this->printProtocol($version, 'approval');
$this->columnEnd();
}
?>
</div>
<?php if($version->getReceiptStatus()) { ?>
<div class="row-fluid">
<div class="span12">
<?php
$this->printProtocol($version, 'receipt');
?>
</div>
</div>
<?php } ?>
<?php if($version->getRevisionStatus()) { ?>
<div class="row-fluid">
<div class="span12">
<?php
$this->rowEnd();
if($version->getReceiptStatus()) {
$this->rowStart();
$this->columnStart(12);
$this->printProtocol($version, 'receipt');
$this->columnEnd();
$this->rowEnd();
}
if($version->getRevisionStatus()) {
$this->rowStart();
$this->columnStart(12);
$this->printProtocol($version, 'revision');
?>
</div>
</div>
<?php } ?>
<?php
$this->columnEnd();
$this->rowEnd();
}
}
?>
</div>
</div>
<?php
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

21
views/bootstrap/class.EditOnline.php
View File

@ -109,13 +109,9 @@ $(document).ready(function() {
$this->contentStart();
$folder = $document->getFolder();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
?>
<?php
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span6\">\n";
$this->contentHeading(getMLText("content"));
$this->rowStart();
$this->columnStart(6);
$this->contentHeading(getMLText("content"));
?>
<form action="../op/op.EditOnline.php" id="form1" method="post">
<input type="hidden" name="documentid" value="<?php echo $document->getId(); ?>" />
@ -134,15 +130,12 @@ $this->contentHeading(getMLText("content"));
?>
</form>
<?php
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
$this->contentHeading(getMLText("preview"));
echo "<div class=\"ajax\" data-view=\"EditOnline\" data-action=\"preview\" data-query=\"documentid=".$document->getId()."\"></div>";
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();

20
views/bootstrap/class.ExtensionMgr.php
View File

@ -249,10 +249,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("extension_manager"));
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->rowStart();
$this->columnStart(4);
if($extmgr->isWritableExtDir()) {
?>
<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
@ -270,9 +268,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
} else {
echo "<div class=\"alert alert-warning\">".getMLText('extension_mgr_no_upload')."</div>";
}
$this->columnEnd();
$this->columnStart(8);
?>
</div>
<div class="span8">
<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="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extension_mgr_repository'); ?></a></li>
@ -287,7 +285,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
<form action="../op/op.ExtensionMgr.php" name="form1" method="post">
<?php echo createHiddenFieldWithKey('extensionmgr'); ?>
<input type="hidden" name="action" value="refresh" />
<p><button type="submit" class="btn"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
<p><button type="submit" class="btn btn-primary"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
</form>
</div>
@ -343,7 +341,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
<input type="hidden" name="action" value="getlist" />
<input type="hidden" name="currenttab" value="repository" />
<input type="hidden" name="forceupdate" value="1" />
<button type="submit" class="btn btn-delete"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
<button type="submit" class="btn btn-primary"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
</form>
</div>
<?php
@ -351,8 +349,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
?>
</div>
</div>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
?>
<div class="modal modal-wide hide" id="extensionInfo" tabindex="-1" role="dialog" aria-labelledby="extensionInfoLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>

25
views/bootstrap/class.FolderAccess.php
View File

@ -90,8 +90,8 @@ $(document).ready(function() {
$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
$this->contentHeading(getMLText("edit_folder_access"));
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span4\">\n";
$this->rowStart();
$this->columnStart(4);
$this->contentContainerStart();
if ($user->isAdmin()) {
@ -148,8 +148,8 @@ $(document).ready(function() {
</p>
<?php
$this->contentContainerEnd();
echo "</div>";
echo "</div>";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
return;
@ -164,8 +164,8 @@ $(document).ready(function() {
<?php
}
$this->contentContainerEnd();
echo "</div>";
echo "<div class=\"span4\">";
$this->columnEnd();
$this->columnStart(4);
$this->contentContainerStart();
$accessList = $folder->getAccessList();
@ -230,10 +230,8 @@ $(document).ready(function() {
</form>
<?php
$this->contentContainerEnd();
?>
</div>
<div class="span4">
<?php
$this->columnEnd();
$this->columnStart(4);
if ((count($accessList["users"]) != 0) || (count($accessList["groups"]) != 0)) {
@ -300,11 +298,8 @@ $(document).ready(function() {
print "</table><br>";
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

12
views/bootstrap/class.FolderNotify.php
View File

@ -89,8 +89,8 @@ $(document).ready(function() {
$groupNotifyIDs[] = $groupNotify->getID();
}
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span6\">\n";
$this->rowStart();
$this->columnStart(6);
$this->contentContainerStart();
?>
@ -142,8 +142,8 @@ $(document).ready(function() {
</form>
<?php
$this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
print "<table class=\"table-condensed\">\n";
if (empty($notifyList["users"]) && empty($notifyList["groups"])) {
print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
@ -186,8 +186,8 @@ $(document).ready(function() {
}
print "</table>\n";
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

30
views/bootstrap/class.GroupMgr.php
View File

@ -297,10 +297,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("group_management"));
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal">
<?php
$options = array();
@ -323,20 +322,19 @@ $(document).ready( function() {
<div class="ajax" style="margin-bottom: 15px;" data-view="GroupMgr" data-action="actionmenu" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
<?php } ?>
</div>
<div class="span8">
<?php $this->contentContainerStart(); ?>
<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
<?php } ?>
<?php $this->contentContainerEnd(); ?>
</div>
</div>
<?php
}
$this->columnEnd();
$this->columnStart(8);
$this->contentContainerStart();
if($accessop->check_view_access($this, array('action'=>'form'))) {
?>
<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
<?php
}
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

14
views/bootstrap/class.Help.php
View File

@ -40,9 +40,9 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
$this->globalNavigation();
$this->contentStart();
// $this->pageNavigation(getMLText("help").": ".getMLText('help_'.strtolower($context), array(), $context), "");
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<legend>Table of contents</legend>
<?php
$dir = "../languages/".$this->params['session']->getLanguage()."/help";
@ -57,9 +57,9 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
}
}
echo "</ul>";
$this->columnEnd();
$this->columnStart(8);
?>
</div>
<div class="span8">
<legend><?php printMLText('help_'.strtolower($context), array(), $context); ?></legend>
<?php
@ -76,10 +76,8 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
readfile("../languages/".$this->params['session']->getLanguage()."/help.htm");
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

12
views/bootstrap/class.ImportUsers.php
View File

@ -51,8 +51,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("import_users"));
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span4\">\n";
$this->rowStart();
$this->columnStart(4);
$this->contentContainerStart();
print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">";
$this->formField(
@ -81,8 +81,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
print "</form>\n";
$this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span8\">\n";
$this->columnEnd();
$this->columnStart(8);
if($newusers) {
echo "<table class=\"table table-condensed\">\n";
echo "<tr>";
@ -121,8 +121,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
*/
echo "</table>";
}
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

19
views/bootstrap/class.Info.php
View File

@ -54,10 +54,9 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
} else {
$this->warningMsg(getMLText('no_version_check'));
}
?>
<div class="row-fluid">
<div class="span6">
<?php
$this->rowStart();
$this->columnStart(6);
$this->contentHeading(getMLText("seeddms_info"));
$seedextensions = $extmgr->getExtensionConfiguration();
echo "<table class=\"table table-condensed\">\n";
@ -73,10 +72,8 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
echo "<tr><td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td></tr>\n";
}
echo "</tbody>\n</table>\n";
?>
</div>
<div class="span6">
<?php
$this->columnEnd();
$this->columnStart(6);
if($user->isAdmin()) {
$this->contentHeading(getMLText("php_info"));
echo "<table class=\"table table-condensed\">\n";
@ -110,10 +107,8 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
echo "<tr><td>".$extname."</td><td>"."</td></tr>\n";
echo "</tbody>\n</table>\n";
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

27
views/bootstrap/class.ManageNotify.php
View File

@ -155,8 +155,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
$this->contentStart();
$this->pageNavigation(getMLText("my_account"), "my_account");
echo "<div class=\"row-fluid\">";
echo "<div class=\"span6\">";
$this->rowStart();
$this->columnStart(6);
$this->contentHeading(getMLText("edit_folder_notify"));
$this->contentContainerStart();
@ -183,9 +183,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
print "</form>";
$this->contentContainerEnd();
echo "</div>";
echo "<div class=\"span6\">";
$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\">";
@ -196,32 +195,30 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
print "</form>";
$this->contentContainerEnd();
echo "</div>";
echo "</div>";
$this->columnEnd();
$this->rowEnd();
//
// Display the results.
//
echo "<div class=\"row-fluid\">";
echo "<div class=\"span6\">";
$this->rowStart();
$this->columnStart(6);
$this->contentHeading(getMLText("user"));
$ret=$this->getNotificationList(false,true);
$this->printFolderNotificationList($ret);
$this->contentHeading(getMLText("group"));
$ret=$this->getNotificationList(true,true);
$this->printFolderNotificationList($ret,false);
echo "</div>";
echo "<div class=\"span6\">";
$this->columnEnd();
$this->columnStart(6);
$this->contentHeading(getMLText("user"));
$ret=$this->getNotificationList(false,false);
$this->printDocumentNotificationList($ret);
$this->contentHeading(getMLText("group"));
$ret=$this->getNotificationList(true,false);
$this->printDocumentNotificationList($ret,false);
echo "</div>";
echo "</div>";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();

15
views/bootstrap/class.MyAccount.php
View File

@ -66,14 +66,14 @@ $(document).ready( function() {
$this->contentContainerStart();
echo "<div class=\"row-fluid\">\n";
$this->rowStart();
if ($enableuserimage){
echo "<div class=\"span2\">\n";
$this->columnStart(2);
print ($user->hasImage() ? "<img class=\"userImage\" src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">" : getMLText("no_user_image"))."\n";
echo "</div>\n";
echo "<div class=\"span10\">\n";
$this->columnEnd();
$this->columnStart(10);
} else {
echo "<div class=\"span12\">\n";
$this->columnStart(12);
}
print "<table class=\"table-condensed\">\n";
@ -157,9 +157,8 @@ $(document).ready( function() {
}
}
print "</table>\n";
print "</div>\n";
print "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();

2
views/bootstrap/class.RemoveDocument.php
View File

@ -52,7 +52,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
<p>
<?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
</p>
<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
</form>
<?php
$this->contentContainerEnd();

2
views/bootstrap/class.RemoveFolder.php
View File

@ -50,7 +50,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
<p>
<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
</p>
<p><button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
<p><button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
</form>
<?php
$this->contentContainerEnd();

2
views/bootstrap/class.RemoveLog.php
View File

@ -54,7 +54,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
}
?>
<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></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();

16
views/bootstrap/class.RemoveWorkflow.php
View File

@ -43,21 +43,25 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("rm_workflow"));
$this->contentContainerStart();
// Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<p><?php printMLText("rm_workflow_warning"); ?></p>
<form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
<?php echo createHiddenFieldWithKey('removeworkflow'); ?>
<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/>
<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>
</div>
<div id="workflowgraph" class="span8">
<?php
$this->columnEnd();
$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>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();

14
views/bootstrap/class.RemoveWorkflowFromDocument.php
View File

@ -65,9 +65,9 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart();
// Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<p><?php printMLText("rm_workflow_warning"); ?></p>
<form method="post" action="../op/op.RemoveWorkflowFromDocument.php" name="form1">
<?php echo createHiddenFieldWithKey('removeworkflowfromdocument'); ?>
@ -75,12 +75,15 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
<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>
</form>
</div>
<div id="workflowgraph" class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
?>
<div id="workflowgraph">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
</div>
</div>
<?php
$this->columnEnd();
$this->contentContainerEnd();
if($wkflog) {
@ -101,6 +104,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
$this->contentContainerEnd();
}
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

20
views/bootstrap/class.ReturnFromSubWorkflow.php
View File

@ -97,9 +97,9 @@ $(document).ready(function() {
$this->contentContainerStart();
// Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form method="post" action="../op/op.ReturnFromSubWorkflow.php" id="form1" name="form1">
<?php echo createHiddenFieldWithKey('returnfromsubworkflow'); ?>
<table>
@ -115,13 +115,17 @@ $(document).ready(function() {
<input type='submit' class="btn" value='<?php printMLText("return_from_subworkflow"); ?>'/>
</td></tr></table>
</form>
</div>
<div id="workflowgraph" class="span8">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo ($transition ? $transition->getID() : ''); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
<h4>Workflow</h4>
</div>
</div>
<?php
$this->columnEnd();
$this->columnStart(4);
?>
<div id="workflowgraph">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo ($transition ? $transition->getID() : ''); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
</div>
<h4>Workflow</h4>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
if($wkflog) {

12
views/bootstrap/class.ReviewSummary.php
View File

@ -63,8 +63,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
$this->contentStart();
$this->pageNavigation(getMLText("my_documents"), "my_documents");
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span6\">\n";
$this->rowStart();
$this->columnStart(6);
$this->contentHeading(getMLText("review_summary"));
// $this->contentContainerStart();
@ -119,8 +119,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
}
// $this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
$this->contentHeading(getMLText("group_review_summary"));
// $this->contentContainerStart();
@ -164,8 +164,8 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
}
// $this->contentContainerEnd();
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

16
views/bootstrap/class.RewindWorkflow.php
View File

@ -65,22 +65,26 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart();
// Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<p><?php printMLText("rewind_workflow_warning"); ?></p>
<form method="post" action="../op/op.RewindWorkflow.php" name="form1">
<?php echo createHiddenFieldWithKey('rewindworkflow'); ?>
<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
<input type='submit' class="btn" value='<?php printMLText("rewind_workflow"); ?>'/>
<button type='submit' class="btn"><i class="fa fa-refresh"></i> <?php printMLText("rewind_workflow"); ?></button>
</form>
</div>
<div id="workflowgraph" class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
?>
<div id="workflowgraph">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="400" style="border: 1px solid #AAA;"></iframe>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
if($wkflog) {

14
views/bootstrap/class.RunSubWorkflow.php
View File

@ -66,9 +66,9 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart();
// Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form method="POST" action="../op/op.RunSubWorkflow.php" name="form1">
<?php echo createHiddenFieldWithKey('runsubworkflow'); ?>
<table>
@ -79,12 +79,16 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
<input type='submit' class="btn" value='<?php printMLText("run_subworkflow"); ?>'/>
</td></tr></table>
</form>
</div>
<div id="workflowgraph" class="span8">
<?php
$this->columnEnd();
$this->columnStart(4);
?>
<div id="workflowgraph">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $subworkflow->getID(); ?>" width="100%" height="400" style="border: 1px solid #AAA;"></iframe>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
if($wkflog) {

14
views/bootstrap/class.Search.php
View File

@ -178,8 +178,8 @@ $(document).ready( function() {
$this->contentStart();
$this->pageNavigation(getMLText("search_results"), "");
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span4\">\n";
$this->rowStart();
$this->columnStart(4);
//echo "<pre>";print_r($_GET);echo "</pre>";
?>
<ul class="nav nav-tabs" id="searchtab">
@ -608,8 +608,8 @@ foreach($facets as $facetname=>$values) {
?>
</div>
<?php
echo "</div>\n";
echo "<div class=\"span8\">\n";
$this->columnEnd();
$this->columnStart(8);
// Search Result {{{
$foldercount = $doccount = 0;
if($entries) {
@ -622,7 +622,7 @@ foreach($facets as $facetname=>$values) {
}
}
*/
print "<div class=\"alert\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>";
print "<div class=\"alert alert-info\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>";
$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
// $this->contentContainerStart();
@ -759,8 +759,8 @@ foreach($facets as $facetname=>$values) {
}
}
// }}}
echo "</div>";
echo "</div>";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

14
views/bootstrap/class.SetWorkflow.php
View File

@ -69,10 +69,8 @@ $(document).ready( function() {
$this->contentContainerStart();
// Display the Workflow form.
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->rowStart();
$this->columnStart(4);
$workflows = $dms->getAllWorkflows();
if($workflows) {
?>
@ -109,13 +107,15 @@ $(document).ready( function() {
<p><?php printMLText('no_workflow_available'); ?></p>
<?php
}
$this->columnEnd();
$this->columnStart(8);
?>
</div>
<div id="workflowgraph" class="span8" style="display: none;">
<div id="workflowgraph" style="display: none;">
<iframe src="" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();

4
views/bootstrap/class.Setup2Factor.php
View File

@ -77,7 +77,7 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("my_account"), "my_account");
$this->contentHeading(getMLText('2_factor_auth'));
echo "<div class=\"alert\">".getMLText('2_factor_auth_info')."</div>";
echo '<div class="row-fluid">';
$this->rowStart();
$this->contentContainerStart('span6');
$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
@ -106,7 +106,7 @@ $(document).ready( function() {
}
$this->contentContainerEnd();
echo '</div>';
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

13
views/bootstrap/class.Statistic.php
View File

@ -180,8 +180,8 @@ li.folderClass {
<?php
$this->contentHeading(getMLText("folders_and_documents_statistic"));
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span8\">\n";
$this->rowStart();
$this->columnStart(8);
$this->contentContainerStart();
print "<ul>\n";
@ -189,9 +189,8 @@ li.folderClass {
print "</ul>\n";
$this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span4\">\n";
$this->columnEnd();
$this->columnStart(4);
$this->contentContainerStart();
print "<legend>".getMLText("legend")."</legend>\n";
print "<ul class=\"unstyled\">\n";
@ -212,8 +211,8 @@ li.folderClass {
print "</ul>\n";
$this->contentContainerEnd();
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
$this->contentEnd();

16
views/bootstrap/class.Timeline.php
View File

@ -231,12 +231,9 @@ div.timeline-event-selected {
$this->globalNavigation();
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
?>
<?php
echo "<div class=\"row-fluid\">\n";
echo "<div class=\"span3\">\n";
$this->rowStart();
$this->columnStart(3);
$this->contentHeading(getMLText("timeline"));
$this->contentContainerStart();
?>
@ -286,13 +283,12 @@ div.timeline-event-selected {
<?php
$this->contentContainerEnd();
echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
echo "</div>\n";
echo "<div class=\"span9\">\n";
$this->columnEnd();
$this->columnStart(9);
$this->contentHeading(getMLText("timeline"));
$this->printTimelineHtml(550);
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();

14
views/bootstrap/class.TriggerWorkflow.php
View File

@ -98,9 +98,9 @@ $(document).ready(function() {
$this->contentContainerStart();
// Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal" method="post" action="../op/op.TriggerWorkflow.php" id="form1" name="form1">
<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
@ -118,12 +118,16 @@ $(document).ready(function() {
$this->formSubmit(getMLText("action_".strtolower($action->getName()), array(), $action->getName()));
?>
</form>
</div>
<div id="workflowgraph" class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
?>
<div id="workflowgraph">
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>&transitions[]=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd();
if($wkflog) {

31
views/bootstrap/class.UserDefaultKeywords.php
View File

@ -74,10 +74,10 @@ $(document).ready(function() {
$this->contentStart();
$this->pageNavigation(getMLText("my_account"), "my_account");
$this->contentHeading(getMLText("edit_default_keywords"));
$this->rowStart();
$this->columnStart(4);
$this->contentContainerStart();
?>
<div class="row-fluid">
<div class="span4">
<?php $this->contentContainerStart(); ?>
<form class="form-horizontal">
<?php
$selected=0;
@ -104,11 +104,12 @@ $(document).ready(function() {
);
?>
</form>
<?php $this->contentContainerEnd(); ?>
</div>
<div class="span8">
<?php $this->contentContainerStart(); ?>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(8);
$this->contentContainerStart();
?>
<div id="keywords0" style="display : none;">
<form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
@ -138,7 +139,7 @@ $(document).ready(function() {
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="hidden" name="action" value="removecategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
<button type="submit" class="btn btn-danger" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
</form>
</div>
@ -176,7 +177,7 @@ $(document).ready(function() {
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
<input type="hidden" name="action" value="removekeywords">
<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
</form>
<br>
<?php } ?>
@ -193,12 +194,10 @@ $(document).ready(function() {
</div>
</div>
<?php } ?>
<?php $this->contentContainerEnd(); ?>
</div>
</div>
<?php
<?php }
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

23
views/bootstrap/class.UsrMgr.php
View File

@ -592,9 +592,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("user_management"));
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal">
<?php
$options = array();
@ -619,19 +619,20 @@ $(document).ready( function() {
<?php } ?>
<?php if($accessobject->check_view_access($this, array('action'=>'info'))) { ?>
<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
<?php } ?>
</div>
<div class="span8">
<?php $this->contentContainerStart(); ?>
<?php
}
$this->columnEnd();
$this->columnStart(8);
$this->contentContainerStart();
?>
<?php if($accessobject->check_view_access($this, array('action'=>'form'))) { ?>
<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
<?php } ?>
</div>
<?php $this->contentContainerEnd(); ?>
</div>
<?php
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

68
views/bootstrap/class.ViewDocument.php
View File

@ -538,11 +538,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$approvalStatus = $latestContent->getApprovalStatus();
$receiptStatus = $latestContent->getReceiptStatus();
$revisionStatus = $latestContent->getRevisionStatus();
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->rowStart();
$this->columnStart(4);
$txt = $this->callHook('startLeftColumn', $document);
if(is_string($txt))
echo $txt;
@ -550,10 +548,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
$this->preview();
}
?>
</div>
<div class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
$txt = $this->callHook('startRightColumn', $document);
if(is_string($txt))
echo $txt;
@ -830,14 +827,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?>
<div class="tab-pane <?php if($currenttab == 'revapp') echo 'active'; ?>" id="revapp">
<?php
print "<div class=\"row-fluid\">";
$this->rowStart();
/* Just check fo an exting reviewStatus, even workflow mode is set
* to traditional_only_approval. There may be old documents which
* are still in S_DRAFT_REV.
*/
if (/*$workflowmode != 'traditional_only_approval' &&*/ is_array($reviewStatus) && count($reviewStatus)>0) {
print "<div class=\"span6\">";
$this->columnStart(6);
// $this->contentContainerStart();
print "<legend>".getMLText('reviewers')."</legend>";
print "<table class=\"table table-condensed\">\n";
@ -938,9 +935,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</table>";
// $this->contentContainerEnd();
print "</div>";
$this->columnEnd();
}
print "<div class=\"span6\">";
$this->columnStart(6);
// $this->contentContainerStart();
print "<legend>".getMLText('approvers')."</legend>";
print "<table class=\"table table-condensed\">\n";
@ -1044,31 +1041,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</table>\n";
// $this->contentContainerEnd();
print "</div>";
print "</div>";
$this->columnEnd();
$this->rowEnd();
if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
?>
<div class="row-fluid">
<?php
$this->rowStart();
/* Check for an existing review log, even if the workflowmode
* is set to traditional_only_approval. There may be old documents
* that still have a review log if the workflow mode has been
* changed afterwards.
*/
if($latestContent->getReviewStatus(10) /*$workflowmode != 'traditional_only_approval'*/) {
?>
<div class="span6">
<?php $this->printProtocol($latestContent, 'review'); ?>
</div>
<?php
$this->columnStart(6);
$this->printProtocol($latestContent, 'review');
$this->columnEnd();
}
?>
<div class="span6">
<?php $this->printProtocol($latestContent, 'approval'); ?>
</div>
</div>
<?php
$this->columnStart(6);
$this->printProtocol($latestContent, 'approval');
$this->columnEnd();
$this->rowEnd();
}
?>
</div>
@ -1086,11 +1077,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?>
<div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
<?php
echo "<div class=\"row-fluid\">";
$this->rowStart();
if ($user_is_involved && $accessobject->check_view_access('WorkflowGraph'))
echo "<div class=\"span6\">";
$this->columnStart(6);
else
echo "<div class=\"span12\">";
$this->columnStart(12);
$this->contentContainerStart();
if($user->isAdmin()) {
if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
@ -1274,15 +1265,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
}
$this->contentContainerEnd();
echo "</div>";
$this->columnEnd();
if ($user_is_involved && $accessobject->check_view_access('WorkflowGraph')) {
echo "<div class=\"span6\">";
$this->columnStart(6);
?>
<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?><?php if($allowedtransitions) foreach($allowedtransitions as $tr) {echo "&transitions[]=".$tr->getID();} ?>" width="99%" height="661" style="border: 1px solid #AAA;"></iframe>
<?php
echo "</div>";
$this->columnEnd();
}
echo "</div>";
$this->rowEnd();
?>
</div>
<?php
@ -1878,10 +1869,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("timeline"));
$this->printTimelineHtml(300);
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
echo $this->callHook('postContent');
$this->contentEnd();
$this->htmlEndPage();

24
views/bootstrap/class.ViewFolder.php
View File

@ -558,7 +558,7 @@ $('body').on('click', '.order-btn', function(ev) {
<div class="ajax" data-view="ViewFolder" data-action="navigation" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
<?php
echo "<div class=\"row-fluid\">\n";
$this->rowStart();
// dynamic columns - left column removed if no content and right column then fills span12.
if (!($enableFolderTree || $enableClipboard)) {
@ -569,7 +569,7 @@ $('body').on('click', '.order-btn', function(ev) {
$RightColumnSpan = 8;
}
if ($LeftColumnSpan > 0) {
echo "<div class=\"span".$LeftColumnSpan."\">\n";
$this->columnStart($LeftColumnSpan);
echo $this->callHook('leftContentPre');
@ -594,13 +594,13 @@ $('body').on('click', '.order-btn', function(ev) {
echo $this->callHook('leftContentPost');
echo "</div>\n";
$this->columnEnd();
}
echo "<div class=\"span".$RightColumnSpan."\">\n";
$this->columnStart($RightColumnSpan);
if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "<div class=\"row-fluid\">";
echo "<div class=\"span8\">";
$this->rowStart();
$this->columnStart(8);
}
// $this->folderInfos();
@ -608,15 +608,15 @@ $('body').on('click', '.order-btn', function(ev) {
<div class="ajax" data-view="ViewFolder" data-action="folderInfos" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
<?php
if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "</div>";
echo "<div class=\"span4\">";
$this->columnEnd();
$this->columnStart(4);
// $this->dropUpload();
?>
<div class="ajax" data-view="ViewFolder" data-action="dropUpload" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
<?php
echo "</div>";
echo "</div>";
$this->columnEnd();
$this->rowEnd();
}
echo $this->callHook('rightContentPre');
@ -624,8 +624,8 @@ $('body').on('click', '.order-btn', function(ev) {
<div class="ajax" data-view="ViewFolder" data-action="folderList" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."&orderby=".$orderby."\"" : "") ?>></div>
<?php
echo $this->callHook('rightContentPost');
echo "</div>\n"; // End of right column div
echo "</div>\n"; // End of div around left and right column
$this->columnEnd(); // End of right column div
$this->rowEnd(); // End of div around left and right column
echo $this->callHook('postContent');

14
views/bootstrap/class.WorkflowActionsMgr.php
View File

@ -181,10 +181,9 @@ $(document).ready( function() {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("workflow_actions_management"));
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal">
<?php
$options = array();
@ -206,14 +205,17 @@ $(document).ready( function() {
</form>
<div class="ajax" style="margin-bottom: 15px;" data-view="WorkflowActionsMgr" data-action="actionmenu" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="WorkflowActionsMgr" data-action="info" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
</div>
<div class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
?>
<div class="ajax" data-view="WorkflowActionsMgr" data-action="form" <?php echo ($selworkflowaction ? "data-query=\"workflowactionid=".$selworkflowaction->getID()."\"" : "") ?>></div>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

23
views/bootstrap/class.WorkflowMgr.php
View File

@ -247,7 +247,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"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
</form>
<?php
echo "</td>";
@ -330,10 +330,9 @@ $(document).ready(function() {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("workflow_management"));
$this->rowStart();
$this->columnStart(5);
?>
<div class="row-fluid">
<div class="span5">
<form class="form-horizontal">
<?php
$options = array();
@ -354,15 +353,15 @@ $(document).ready(function() {
?>
</form>
<div class="ajax" style="margin-bottom: 15px;" data-view="WorkflowMgr" data-action="actionmenu" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="WorkflowMgr" data-action="info" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
</div>
<div class="span7">
<div class="ajax" data-view="WorkflowMgr" data-action="form" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
</div>
</div>
<div class="ajax" data-view="WorkflowMgr" data-action="info" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
<?php
$this->columnEnd();
$this->columnStart(7);
?>
<div class="ajax" data-view="WorkflowMgr" data-action="form" <?php echo ($selworkflow ? "data-query=\"workflowid=".$selworkflow->getID()."\"" : "") ?>></div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

19
views/bootstrap/class.WorkflowStatesMgr.php
View File

@ -194,10 +194,9 @@ $(document).ready(function() {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("workflow_states_management"));
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal">
<?php
$options = array();
@ -219,14 +218,14 @@ $(document).ready(function() {
</form>
<div class="ajax" style="margin-bottom: 15px;" data-view="WorkflowStatesMgr" data-action="actionmenu" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="WorkflowStatesMgr" data-action="info" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
</div>
<div class="span8">
<div class="ajax" data-view="WorkflowStatesMgr" data-action="form" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
</div>
</div>
<?php
$this->columnEnd();
$this->columnStart(8);
?>
<div class="ajax" data-view="WorkflowStatesMgr" data-action="form" <?php echo ($selworkflowstate ? "data-query=\"workflowstateid=".$selworkflowstate->getID()."\"" : "") ?>></div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */