gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 13:11:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use new row, column methods instead of plain html

Browse Source
This commit is contained in:
Uwe Steinmann 2020-10-08 07:57:23 +02:00
parent 28e7b32ddf
commit d1a5a6823b
34 changed files with 323 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -325,10 +325,9 @@ $(document).ready( function() {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("attrdef_management")); $this->contentHeading(getMLText("attrdef_management"));
$this->rowStart();
$this->columnStart(6);
?> ?>
<div class="row-fluid">
<div class="span6">
<form class="form-horizontal"> <form class="form-horizontal">
<select class="chzn-select" id="selector" class="input-xlarge"> <select class="chzn-select" id="selector" class="input-xlarge">
<option value="-1"><?php echo getMLText("choose_attrdef")?></option> <option value="-1"><?php echo getMLText("choose_attrdef")?></option>
@ -396,17 +395,17 @@ $(document).ready( function() {
</form> </form>
<div class="ajax" style="margin-bottom: 15px;" data-view="AttributeMgr" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div> <div class="ajax" style="margin-bottom: 15px;" data-view="AttributeMgr" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div> <div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
</div> <?php
$this->columnEnd();
<div class="span6"> $this->columnStart(6);
?>
<?php $this->contentContainerStart(); ?> <?php $this->contentContainerStart(); ?>
<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div> <div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
<?php $this->contentContainerEnd(); ?>
</div>
</div>
<?php <?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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

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

@ -151,9 +151,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("global_document_categories")); $this->contentHeading(getMLText("global_document_categories"));
$this->rowStart();
$this->columnStart(6);
?> ?>
<div class="row-fluid">
<div class="span6">
<form class="form-horizontal"> <form class="form-horizontal">
<select class="chzn-select" id="selector" class="input-xlarge"> <select class="chzn-select" id="selector" class="input-xlarge">
<option value="-1"><?php echo getMLText("choose_category")?> <option value="-1"><?php echo getMLText("choose_category")?>
@ -167,16 +167,17 @@ $(document).ready( function() {
</form> </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" 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 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 <?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->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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

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

@ -240,9 +240,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("global_default_keywords")); $this->contentHeading(getMLText("global_default_keywords"));
$this->rowStart();
$this->columnStart(4);
?> ?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal"> <form class="form-horizontal">
<select class="chzn-select" id="selector" class="input-xlarge"> <select class="chzn-select" id="selector" class="input-xlarge">
<option value="-1"><?php echo getMLText("choose_category")?> <option value="-1"><?php echo getMLText("choose_category")?>
@ -264,16 +264,17 @@ $(document).ready( function() {
</select> </select>
</form> </form>
<div class="ajax" style="margin-bottom: 15px;" data-view="DefaultKeywords" data-action="actionmenu" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div> <div class="ajax" style="margin-bottom: 15px;" data-view="DefaultKeywords" data-action="actionmenu" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
</div> <?php
$this->columnEnd();
<div class="span8"> $this->columnStart(8);
<?php $this->contentContainerStart(); ?> $this->contentContainerStart();
?>
<div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div> <div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
</div> </div>
<?php $this->contentContainerEnd(); ?>
</div>
<?php <?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $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->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("edit_document_access")); $this->contentHeading(getMLText("edit_document_access"));
echo "<div class=\"row-fluid\">\n"; $this->rowStart();
echo "<div class=\"span4\">\n"; $this->columnStart(4);
$this->contentContainerStart(); $this->contentContainerStart();
if ($user->isAdmin()) { if ($user->isAdmin()) {
@ -149,8 +149,8 @@ $(document).ready( function() {
</p> </p>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
echo "</div>"; $this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
return; return;
@ -164,8 +164,8 @@ $(document).ready( function() {
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
echo "<div class=\"span4\">"; $this->columnStart(4);
$this->contentContainerStart(); $this->contentContainerStart();
$accessList = $document->getAccessList(); $accessList = $document->getAccessList();
@ -239,10 +239,8 @@ $(document).ready( function() {
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
?> $this->columnEnd();
</div> $this->columnStart(4);
<div class="span4">
<?php
/* memorize users with access rights */ /* memorize users with access rights */
$memusers = array(); $memusers = array();
/* memorize groups with access rights */ /* memorize groups with access rights */
@ -314,11 +312,8 @@ $(document).ready( function() {
print "</table><br>"; print "</table><br>";
} }
?> $this->columnEnd();
</div> $this->rowEnd();
</div>
<?php
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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

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

@ -157,10 +157,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$this->globalNavigation($folder); $this->globalNavigation($folder);
$this->contentStart(); $this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
?> $this->rowStart();
<div class="row-fluid"> $this->columnStart(4);
<div class="span4">
<?php
$this->contentHeading(getMLText("document_infos")); $this->contentHeading(getMLText("document_infos"));
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
@ -243,10 +241,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
$this->preview(); $this->preview();
?> $this->columnEnd();
</div> $this->columnStart(8);
<div class="span8">
<?php
// verify if file exists // verify if file exists
$file_exists=file_exists($dms->contentDir . $version->getPath()); $file_exists=file_exists($dms->contentDir . $version->getPath());
@ -348,8 +344,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$this->contentContainerEnd(); $this->contentContainerEnd();
print "<div class=\"row-fluid\">"; $this->rowStart();
print "<div class=\"span6\">"; $this->columnStart(6);
if (is_array($reviewStatus) && count($reviewStatus)>0) { /* {{{ */ if (is_array($reviewStatus) && count($reviewStatus)>0) { /* {{{ */
@ -402,8 +398,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</table>\n"; print "</table>\n";
} /* }}} */ } /* }}} */
print "</div>\n"; $this->columnEnd();
print "<div class=\"span6\">"; $this->columnStart(6);
if (is_array($approvalStatus) && count($approvalStatus)>0) { /* {{{ */ if (is_array($approvalStatus) && count($approvalStatus)>0) { /* {{{ */
@ -456,8 +452,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</table>\n"; print "</table>\n";
} /* }}} */ } /* }}} */
print "</div>\n"; $this->columnEnd();
print "</div>\n"; $this->rowEnd();
/* Get attachments exclusively for this version, without those /* Get attachments exclusively for this version, without those
* attached to the document * attached to the document
@ -577,36 +573,26 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</tbody>\n</table>\n"; print "</tbody>\n</table>\n";
$this->contentContainerEnd(); $this->contentContainerEnd();
} }
?> $this->rowStart();
<div class="row-fluid">
<?php
/* Check for an existing review log, even if the workflowmode /* Check for an existing review log, even if the workflowmode
* is set to traditional_only_approval. There may be old documents * is set to traditional_only_approval. There may be old documents
* that still have a review log if the workflow mode has been * that still have a review log if the workflow mode has been
* changed afterwards. * changed afterwards.
*/ */
if($version->getReviewStatus(10)) { if($version->getReviewStatus(10)) {
?> $this->columnStart(6);
<div class="span6"> $this->printProtocol($version, 'review');
<?php $this->printProtocol($version, 'review'); ?> $this->columnEnd();
</div>
<?php
} }
if($version->getApprovalStatus(10)) { if($version->getApprovalStatus(10)) {
?> $this->columnStart(6);
<div class="span6"> $this->printProtocol($version, 'approval');
<?php $this->printProtocol($version, 'approval'); ?> $this->columnEnd();
</div>
<?php
} }
?> $this->rowEnd();
</div>
<?php
} }
?> $this->columnEnd();
</div> $this->rowEnd();
</div>
<?php
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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

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

@ -250,10 +250,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("extension_manager")); $this->contentHeading(getMLText("extension_manager"));
?> $this->rowStart();
<div class="row-fluid"> $this->columnStart(4);
<div class="span4">
<?php
if($extmgr->isWritableExtDir()) { if($extmgr->isWritableExtDir()) {
?> ?>
<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php"> <form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
@ -271,9 +269,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
} else { } else {
echo "<div class=\"alert alert-warning\">".getMLText('extension_mgr_no_upload')."</div>"; 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"> <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 || $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> <li class="<?php if($currenttab == 'repository') echo 'active'; ?>"><a data-target="#repository" data-toggle="tab"><?= getMLText('extension_mgr_repository'); ?></a></li>
@ -288,7 +286,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
<form action="../op/op.ExtensionMgr.php" name="form1" method="post"> <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
<?php echo createHiddenFieldWithKey('extensionmgr'); ?> <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
<input type="hidden" name="action" value="refresh" /> <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> </form>
</div> </div>
@ -343,13 +341,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
<input type="hidden" name="action" value="getlist" /> <input type="hidden" name="action" value="getlist" />
<input type="hidden" name="currenttab" value="repository" /> <input type="hidden" name="currenttab" value="repository" />
<input type="hidden" name="forceupdate" value="1" /> <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> </form>
</div> </div>
</div> </div>
</div> </div>
</div> <?php
</div> $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 modal-wide hide" id="extensionInfo" tabindex="-1" role="dialog" aria-labelledby="extensionInfoLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <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->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
$this->contentHeading(getMLText("edit_folder_access")); $this->contentHeading(getMLText("edit_folder_access"));
echo "<div class=\"row-fluid\">\n"; $this->rowStart();
echo "<div class=\"span4\">\n"; $this->columnStart(4);
$this->contentContainerStart(); $this->contentContainerStart();
if ($user->isAdmin()) { if ($user->isAdmin()) {
@ -148,8 +148,8 @@ $(document).ready(function() {
</p> </p>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
echo "</div>"; $this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
return; return;
@ -164,8 +164,8 @@ $(document).ready(function() {
<?php <?php
} }
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
echo "<div class=\"span4\">"; $this->columnStart(4);
$this->contentContainerStart(); $this->contentContainerStart();
$accessList = $folder->getAccessList(); $accessList = $folder->getAccessList();
@ -230,10 +230,8 @@ $(document).ready(function() {
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
?> $this->columnEnd();
</div> $this->columnStart(4);
<div class="span4">
<?php
if ((count($accessList["users"]) != 0) || (count($accessList["groups"]) != 0)) { if ((count($accessList["users"]) != 0) || (count($accessList["groups"]) != 0)) {
@ -300,11 +298,8 @@ $(document).ready(function() {
print "</table><br>"; print "</table><br>";
} }
?> $this->columnEnd();
</div> $this->rowEnd();
</div>
<?php
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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

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

@ -296,10 +296,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("group_management")); $this->contentHeading(getMLText("group_management"));
$this->rowStart();
$this->columnStart(4);
?> ?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal"> <form class="form-horizontal">
<?php <?php
$options = array(); $options = array();
@ -321,17 +320,16 @@ $(document).ready( function() {
</form> </form>
<div class="ajax" style="margin-bottom: 15px;" data-view="GroupMgr" data-action="actionmenu" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div> <div class="ajax" style="margin-bottom: 15px;" data-view="GroupMgr" data-action="actionmenu" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div> <div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
</div>
<div class="span8">
<?php $this->contentContainerStart(); ?>
<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
<?php $this->contentContainerEnd(); ?>
</div>
</div>
<?php <?php
$this->columnEnd();
$this->columnStart(8);
$this->contentContainerStart();
?>
<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->contentEnd();
$this->htmlEndPage(); $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->globalNavigation();
$this->contentStart(); $this->contentStart();
// $this->pageNavigation(getMLText("help").": ".getMLText('help_'.strtolower($context), array(), $context), ""); // $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> <legend>Table of contents</legend>
<?php <?php
$dir = "../languages/".$this->params['session']->getLanguage()."/help"; $dir = "../languages/".$this->params['session']->getLanguage()."/help";
@ -57,9 +57,9 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
} }
} }
echo "</ul>"; echo "</ul>";
$this->columnEnd();
$this->columnStart(8);
?> ?>
</div>
<div class="span8">
<legend><?php printMLText('help_'.strtolower($context), array(), $context); ?></legend> <legend><?php printMLText('help_'.strtolower($context), array(), $context); ?></legend>
<?php <?php
@ -76,10 +76,8 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
readfile("../languages/".$this->params['session']->getLanguage()."/help.htm"); readfile("../languages/".$this->params['session']->getLanguage()."/help.htm");
} }
?> $this->columnEnd();
</div> $this->rowEnd();
</div>
<?php
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $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")); $this->contentHeading(getMLText("import_users"));
echo "<div class=\"row-fluid\">\n"; $this->rowStart();
echo "<div class=\"span4\">\n"; $this->columnStart(4);
$this->contentContainerStart(); $this->contentContainerStart();
print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">"; print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">";
$this->formField( $this->formField(
@ -81,8 +81,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
print "</form>\n"; print "</form>\n";
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>\n"; $this->columnEnd();
echo "<div class=\"span8\">\n"; $this->columnStart(8);
if($newusers) { if($newusers) {
echo "<table class=\"table table-condensed\">\n"; echo "<table class=\"table table-condensed\">\n";
echo "<tr>"; echo "<tr>";
@ -121,8 +121,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
*/ */
echo "</table>"; echo "</table>";
} }
echo "</div>\n"; $this->columnEnd();
echo "</div>\n"; $this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

@ -153,8 +153,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("my_account"), "my_account"); $this->pageNavigation(getMLText("my_account"), "my_account");
echo "<div class=\"row-fluid\">"; $this->rowStart();
echo "<div class=\"span6\">"; $this->columnStart(6);
$this->contentHeading(getMLText("edit_folder_notify")); $this->contentHeading(getMLText("edit_folder_notify"));
$this->contentContainerStart(); $this->contentContainerStart();
@ -181,9 +181,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add')); $this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
print "</form>"; print "</form>";
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
$this->columnStart(6);
echo "<div class=\"span6\">";
$this->contentHeading(getMLText("edit_document_notify")); $this->contentHeading(getMLText("edit_document_notify"));
$this->contentContainerStart(); $this->contentContainerStart();
print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=document&action=add\" name=\"form2\">"; print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=document&action=add\" name=\"form2\">";
@ -194,32 +193,30 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
print "</form>"; print "</form>";
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
echo "</div>"; $this->rowEnd();
// //
// Display the results. // Display the results.
// //
echo "<div class=\"row-fluid\">"; $this->rowStart();
echo "<div class=\"span6\">"; $this->columnStart(6);
$this->contentHeading(getMLText("user")); $this->contentHeading(getMLText("user"));
$ret=$this->getNotificationList(false,true); $ret=$this->getNotificationList(false,true);
$this->printFolderNotificationList($ret); $this->printFolderNotificationList($ret);
$this->contentHeading(getMLText("group")); $this->contentHeading(getMLText("group"));
$ret=$this->getNotificationList(true,true); $ret=$this->getNotificationList(true,true);
$this->printFolderNotificationList($ret,false); $this->printFolderNotificationList($ret,false);
echo "</div>"; $this->columnEnd();
$this->columnStart(6);
echo "<div class=\"span6\">";
$this->contentHeading(getMLText("user")); $this->contentHeading(getMLText("user"));
$ret=$this->getNotificationList(false,false); $ret=$this->getNotificationList(false,false);
$this->printDocumentNotificationList($ret); $this->printDocumentNotificationList($ret);
$this->contentHeading(getMLText("group")); $this->contentHeading(getMLText("group"));
$ret=$this->getNotificationList(true,false); $ret=$this->getNotificationList(true,false);
$this->printDocumentNotificationList($ret,false); $this->printDocumentNotificationList($ret,false);
echo "</div>"; $this->columnEnd();
echo "</div>"; $this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();

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

@ -53,14 +53,14 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart(); $this->contentContainerStart();
echo "<div class=\"row-fluid\">\n"; $this->rowStart();
if ($enableuserimage){ 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"; print ($user->hasImage() ? "<img class=\"userImage\" src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">" : getMLText("no_user_image"))."\n";
echo "</div>\n"; $this->columnEnd();
echo "<div class=\"span10\">\n"; $this->columnStart(10);
} else { } else {
echo "<div class=\"span12\">\n"; $this->columnStart(12);
} }
print "<table class=\"table-condensed\">\n"; print "<table class=\"table-condensed\">\n";
@ -113,8 +113,8 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
print "</tr>\n"; print "</tr>\n";
} }
print "</table>\n"; print "</table>\n";
print "</div>\n"; $this->columnEnd();
print "</div>\n"; $this->rowEnd();
$this->contentContainerEnd(); $this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();

14
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->contentHeading(getMLText("rm_workflow"));
$this->contentContainerStart(); $this->contentContainerStart();
// Display the Workflow form. // Display the Workflow form.
$this->rowStart();
$this->columnStart(4);
?> ?>
<div class="row-fluid">
<div class="span4">
<p><?php printMLText("rm_workflow_warning"); ?></p> <p><?php printMLText("rm_workflow_warning"); ?></p>
<form method="post" action="../op/op.RemoveWorkflow.php" name="form1"> <form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
<?php echo createHiddenFieldWithKey('removeworkflow'); ?> <?php echo createHiddenFieldWithKey('removeworkflow'); ?>
<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/> <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"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
</form> </form>
</div> <?php
<div id="workflowgraph" class="span8"> $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> <iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>" width="100%" height="661" style="border: 1px solid #AAA;"></iframe>
</div> </div>
</div>
<?php <?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd(); $this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();

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

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

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

@ -97,9 +97,9 @@ $(document).ready(function() {
$this->contentContainerStart(); $this->contentContainerStart();
// Display the Workflow form. // 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"> <form method="post" action="../op/op.ReturnFromSubWorkflow.php" id="form1" name="form1">
<?php echo createHiddenFieldWithKey('returnfromsubworkflow'); ?> <?php echo createHiddenFieldWithKey('returnfromsubworkflow'); ?>
<table> <table>
@ -115,13 +115,16 @@ $(document).ready(function() {
<input type='submit' class="btn" value='<?php printMLText("return_from_subworkflow"); ?>'/> <input type='submit' class="btn" value='<?php printMLText("return_from_subworkflow"); ?>'/>
</td></tr></table> </td></tr></table>
</form> </form>
</div> <?php
<div id="workflowgraph" class="span8"> $this->columnEnd();
$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="500" style="border: 1px solid #AAA;"></iframe>
<h4>Workflow</h4> <h4>Workflow</h4>
</div>
</div>
<?php <?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd(); $this->contentContainerEnd();
if($wkflog) { if($wkflog) {

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

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

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

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

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

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

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

@ -69,10 +69,8 @@ $(document).ready( function() {
$this->contentContainerStart(); $this->contentContainerStart();
// Display the Workflow form. // Display the Workflow form.
?> $this->rowStart();
<div class="row-fluid"> $this->columnStart(4);
<div class="span4">
<?php
$workflows = $dms->getAllWorkflows(); $workflows = $dms->getAllWorkflows();
if($workflows) { if($workflows) {
?> ?>
@ -109,13 +107,15 @@ $(document).ready( function() {
<p><?php printMLText('no_workflow_available'); ?></p> <p><?php printMLText('no_workflow_available'); ?></p>
<?php <?php
} }
$this->columnEnd();
$this->columnStart(8);
?> ?>
</div> <div id="workflowgraph" style="display: none;">
<div id="workflowgraph" class="span8" style="display: none;">
<iframe src="" width="100%" height="500" style="border: 1px solid #AAA;"></iframe> <iframe src="" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
</div> </div>
</div>
<?php <?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd(); $this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $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->pageNavigation(getMLText("my_account"), "my_account");
$this->contentHeading(getMLText('2_factor_auth')); $this->contentHeading(getMLText('2_factor_auth'));
echo "<div class=\"alert\">".getMLText('2_factor_auth_info')."</div>"; echo "<div class=\"alert\">".getMLText('2_factor_auth_info')."</div>";
echo '<div class="row-fluid">'; $this->rowStart();
$this->contentContainerStart('span6'); $this->contentContainerStart('span6');
$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS'); $tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
@ -106,7 +106,7 @@ $(document).ready( function() {
} }
$this->contentContainerEnd(); $this->contentContainerEnd();
echo '</div>'; $this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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

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

@ -98,9 +98,9 @@ $(document).ready(function() {
$this->contentContainerStart(); $this->contentContainerStart();
// Display the Workflow form. // 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"> <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='documentid' value='<?php echo $document->getId(); ?>'/>
<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/> <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())); $this->formSubmit(getMLText("action_".strtolower($action->getName()), array(), $action->getName()));
?> ?>
</form> </form>
</div> <?php
<div id="workflowgraph" class="span8"> $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> <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>
</div>
<?php <?php
$this->columnEnd();
$this->rowEnd();
$this->contentContainerEnd(); $this->contentContainerEnd();
if($wkflog) { if($wkflog) {

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

@ -74,10 +74,10 @@ $(document).ready(function() {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("my_account"), "my_account"); $this->pageNavigation(getMLText("my_account"), "my_account");
$this->contentHeading(getMLText("edit_default_keywords")); $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"> <form class="form-horizontal">
<?php <?php
$selected=0; $selected=0;
@ -104,11 +104,12 @@ $(document).ready(function() {
); );
?> ?>
</form> </form>
<?php $this->contentContainerEnd(); ?> <?php
</div> $this->contentContainerEnd();
$this->columnEnd();
<div class="span8"> $this->columnStart(8);
<?php $this->contentContainerStart(); ?> $this->contentContainerStart();
?>
<div id="keywords0" style="display : none;"> <div id="keywords0" style="display : none;">
<form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory"> <form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
@ -193,12 +194,10 @@ $(document).ready(function() {
</div> </div>
</div> </div>
<?php } ?> <?php }
<?php $this->contentContainerEnd(); ?> $this->contentContainerEnd();
</div> $this->columnEnd();
</div> $this->rowEnd();
<?php
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

@ -531,9 +531,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("user_management")); $this->contentHeading(getMLText("user_management"));
$this->rowStart();
$this->columnStart(4);
?> ?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal"> <form class="form-horizontal">
<?php <?php
$options = array(); $options = array();
@ -555,16 +555,17 @@ $(document).ready( function() {
</form> </form>
<div class="ajax" style="margin-bottom: 15px;" data-view="UsrMgr" data-action="actionmenu" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div> <div class="ajax" style="margin-bottom: 15px;" data-view="UsrMgr" data-action="actionmenu" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div> <div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
</div> <?php
$this->columnEnd();
<div class="span8"> $this->columnStart(4);
<?php $this->contentContainerStart(); ?> $this->contentContainerStart();
?>
<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div> <div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
</div> </div>
<?php $this->contentContainerEnd(); ?> <?php
</div> $this->contentContainerEnd();
$this->columnEnd();
<?php $this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

@ -519,20 +519,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$status = $latestContent->getStatus(); $status = $latestContent->getStatus();
$reviewStatus = $latestContent->getReviewStatus(); $reviewStatus = $latestContent->getReviewStatus();
$approvalStatus = $latestContent->getApprovalStatus(); $approvalStatus = $latestContent->getApprovalStatus();
?>
<div class="row-fluid"> $this->rowStart();
<div class="span4"> $this->columnStart(4);
<?php
$txt = $this->callHook('startLeftColumn', $document); $txt = $this->callHook('startLeftColumn', $document);
if(is_string($txt)) if(is_string($txt))
echo $txt; echo $txt;
$this->documentInfos(); $this->documentInfos();
$this->preview(); $this->preview();
?>
</div> $this->columnEnd();
<div class="span8"> $this->columnStart(8);
<?php
$txt = $this->callHook('startRightColumn', $document); $txt = $this->callHook('startRightColumn', $document);
if(is_string($txt)) if(is_string($txt))
echo $txt; echo $txt;
@ -769,14 +767,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?> ?>
<div class="tab-pane <?php if($currenttab == 'revapp') echo 'active'; ?>" id="revapp"> <div class="tab-pane <?php if($currenttab == 'revapp') echo 'active'; ?>" id="revapp">
<?php <?php
print "<div class=\"row-fluid\">"; $this->rowStart();
/* Just check fo an exting reviewStatus, even workflow mode is set /* Just check fo an exting reviewStatus, even workflow mode is set
* to traditional_only_approval. There may be old documents which * to traditional_only_approval. There may be old documents which
* are still in S_DRAFT_REV. * are still in S_DRAFT_REV.
*/ */
if (/*$workflowmode != 'traditional_only_approval' &&*/ is_array($reviewStatus) && count($reviewStatus)>0) { if (/*$workflowmode != 'traditional_only_approval' &&*/ is_array($reviewStatus) && count($reviewStatus)>0) {
print "<div class=\"span6\">"; $this->columnStart(6);
// $this->contentContainerStart(); // $this->contentContainerStart();
print "<legend>".getMLText('reviewers')."</legend>"; print "<legend>".getMLText('reviewers')."</legend>";
print "<table class=\"table table-condensed\">\n"; print "<table class=\"table table-condensed\">\n";
@ -875,9 +873,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</table>"; print "</table>";
// $this->contentContainerEnd(); // $this->contentContainerEnd();
print "</div>"; $this->columnEnd();
} }
print "<div class=\"span6\">"; $this->columnStart(6);
// $this->contentContainerStart(); // $this->contentContainerStart();
print "<legend>".getMLText('approvers')."</legend>"; print "<legend>".getMLText('approvers')."</legend>";
print "<table class=\"table table-condensed\">\n"; print "<table class=\"table table-condensed\">\n";
@ -979,31 +977,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</table>\n"; print "</table>\n";
// $this->contentContainerEnd(); // $this->contentContainerEnd();
print "</div>"; $this->columnEnd();
print "</div>"; $this->rowEnd();
if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) { if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
?> $this->rowStart();
<div class="row-fluid">
<?php
/* Check for an existing review log, even if the workflowmode /* Check for an existing review log, even if the workflowmode
* is set to traditional_only_approval. There may be old documents * is set to traditional_only_approval. There may be old documents
* that still have a review log if the workflow mode has been * that still have a review log if the workflow mode has been
* changed afterwards. * changed afterwards.
*/ */
if($latestContent->getReviewStatus(10) /*$workflowmode != 'traditional_only_approval'*/) { if($latestContent->getReviewStatus(10) /*$workflowmode != 'traditional_only_approval'*/) {
?> $this->columnStart(6);
<div class="span6"> $this->printProtocol($latestContent, 'review');
<?php $this->printProtocol($latestContent, 'review'); ?> $this->columnEnd();
</div>
<?php
} }
?> $this->columnStart(6);
<div class="span6"> $this->printProtocol($latestContent, 'approval');
<?php $this->printProtocol($latestContent, 'approval'); ?> $this->columnEnd();
</div> $this->rowEnd();
</div>
<?php
} }
?> ?>
</div> </div>
@ -1021,11 +1013,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?> ?>
<div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow"> <div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
<?php <?php
echo "<div class=\"row-fluid\">"; $this->rowStart();
if($user_is_involved || $user->isAdmin()) if($user_is_involved || $user->isAdmin())
echo "<div class=\"span6\">"; $this->columnStart(6);
else else
echo "<div class=\"span12\">"; $this->columnStart(12);
$this->contentContainerStart(); $this->contentContainerStart();
if($user->isAdmin()) { if($user->isAdmin()) {
if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) { if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
@ -1209,15 +1201,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
} }
} }
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; $this->columnEnd();
if($user_is_involved || $user->isAdmin()) { if($user_is_involved || $user->isAdmin()) {
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> <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 <?php
echo "</div>"; $this->columnEnd();
} }
echo "</div>"; $this->rowEnd();
?> ?>
</div> </div>
<?php <?php
@ -1541,10 +1533,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("timeline")); $this->contentHeading(getMLText("timeline"));
$this->printTimelineHtml(300); $this->printTimelineHtml(300);
} }
?>
</div> $this->columnEnd();
</div> $this->rowEnd();
<?php
echo $this->callHook('postContent'); echo $this->callHook('postContent');
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();

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

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

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

@ -330,10 +330,9 @@ $(document).ready(function() {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("workflow_management")); $this->contentHeading(getMLText("workflow_management"));
$this->rowStart();
$this->columnStart(5);
?> ?>
<div class="row-fluid">
<div class="span5">
<form class="form-horizontal"> <form class="form-horizontal">
<?php <?php
$options = array(); $options = array();
@ -354,15 +353,15 @@ $(document).ready(function() {
?> ?>
</form> </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" 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 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>
<?php <?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->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

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

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