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

use class SeedDMS_Theme_Style, remove plain html

Browse Source
This commit is contained in:
Uwe Steinmann 2021-04-19 19:45:40 +02:00
parent d3631a4f61
commit 7b30188dd9
15 changed files with 231 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
//require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for Acl view
@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
* @copyright Copyright (C) 2016 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
class SeedDMS_View_Acl extends SeedDMS_Theme_Style {
function js() { /* {{{ */
$selrole = $this->params['selrole'];
@ -241,10 +241,8 @@ $(document).ready( function() {
if(!$settings->_advancedAcl) {
$this->warningMsg(getMLText("access_control_is_off"));
}
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->rowStart();
$this->columnStart(4);
$this->contentHeading(getMLText("role"));
?>
<form class="form-horizontal">
@ -267,11 +265,10 @@ $(document).ready( function() {
</form>
<?php if($accessop->check_view_access($this, array('action'=>'info')) || $user->isAdmin()) { ?>
<div class="ajax" data-view="Acl" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
<?php } ?>
</div>
<div class="span8">
<?php
}
$this->columnEnd();
$this->columnStart(8);
$this->contentHeading(getMLText("access_control"));
if($selrole) {
@ -285,10 +282,8 @@ $(document).ready( function() {
<?php
}
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

71
views/bootstrap/class.MyDocuments.php
View File

@ -45,7 +45,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Theme_Style {
$this->printClickDocumentJs();
?>
$(document).ready( function() {
$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
$('body').on('click', 'ul.sidenav li a', function(ev){
ev.preventDefault();
$('#kkkk.ajax').data('action', $(this).data('action'));
$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
@ -734,67 +734,72 @@ $(document).ready( function() {
echo '<div class="row-fluid">';
echo '<div class="span3">';
$this->rowStart();
$this->columnStart(3);
$this->contentHeading(getMLText("my_documents"));
echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
$menuitems = [];
$resArr = $dms->getDocumentList('MyDocs', $user);
echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
$menuitems[] = array('label'=>getMLText('all_documents'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#all_documents"), array('data-action', "listmyDocs")));
$resArr = $dms->getDocumentList('ReceiveOwner', $user);
echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_user_reception'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_reception"), array('data-action', "listReceiveOwner")));
$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_user_no_reception'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_no_reception"), array('data-action', "listNoReceiveOwner")));
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
$resArr = $dms->getDocumentList('AppRevOwner', $user);
echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_user_requiring_attention'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_requiring_attention"), array('data-action', "listDocsToLookAt")));
}
echo '</ul>';
self::showNavigationListWithBadges($menuitems);
$menuitems = [];
$this->contentHeading(getMLText("documents_in_process"));
echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
$resArr = $dms->getDocumentList('DraftOwner', $user);
echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_user_draft'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_draft"), array('data-action', "listDraftOwner")));
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
$resArr = $dms->getDocumentList('RejectOwner', $user);
echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_user_rejected'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_rejected"), array('data-action', "listRejects")));
}
$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_checked_out_by_you'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_checked_out_by_you"), array('data-action', "listCheckedoutDocs")));
$resArr = $dms->getDocumentList('LockedByMe', $user);
echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
echo '</ul>';
$menuitems[] = array('label'=>getMLText('documents_locked_by_you'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_locked_by_you"), array('data-action', "listLockedDocs")));
self::showNavigationListWithBadges($menuitems);
$menuitems = [];
$this->contentHeading(getMLText("tasks"));
echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
if($workflowmode == 'traditional') {
$resArr = $dms->getDocumentList('ReviewByMe', $user);
echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_to_review'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_review"), array('data-action', "listReviews")));
}
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
$resArr = $dms->getDocumentList('ApproveByMe', $user);
echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_to_approve'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_approve"), array('data-action', "listApprovals")));
} else {
$resArr = $dms->getDocumentList('WorkflowByMe', $user);
echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_to_process'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_process"), array('data-action', "listWorkflow")));
}
$resArr = $dms->getDocumentList('ReceiptByMe', $user);
echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_to_receipt'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_receipt"), array('data-action', "listReceipts")));
$resArr = $dms->getDocumentList('ReviseByMe', $user);
echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
$menuitems[] = array('label'=>getMLText('documents_to_revise'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_revise"), array('data-action', "listRevisions")));
$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
echo '</ul>';
$this->contentHeading(getMLText("archive"));
echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
$resArr = $dms->getDocumentList('ExpiredOwner', $user);
echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
echo '</ul>';
echo '</div>';
echo '<div class="span9">';
$menuitems[] = array('label'=>getMLText('documents_user_needs_correction'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_needs_correction"), array('data-action', "listNeedsCorrectionOwner")));
self::showNavigationListWithBadges($menuitems);
$menuitems = [];
$this->contentHeading(getMLText("archive"));
$resArr = $dms->getDocumentList('ExpiredOwner', $user);
$menuitems[] = array('label'=>getMLText('documents_user_expiration'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_expiration"), array('data-action', "listExpiredOwner")));
$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
$menuitems[] = array('label'=>getMLText('documents_user_obsolete'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_obsolete"), array('data-action', "listObsoleteOwner")));
self::showNavigationListWithBadges($menuitems);
$this->columnEnd();
$this->columnStart(9);
echo '<div id="kkkk" class="ajax" data-view="MyDocuments" data-action="'.($listtype ? $listtype : 'listDocsToLookAt').'"></div>';
echo '</div>';
echo '</div>';
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

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

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

@ -16,7 +16,7 @@
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
class SeedDMS_View_ReceiptSummary extends SeedDMS_Theme_Style {
function js() { /* {{{ */
header('Content-Type: application/javascript; charset=UTF-8');
@ -62,8 +62,8 @@ class SeedDMS_View_ReceiptSummary 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("receipt_summary"));
// TODO: verificare scadenza
@ -118,8 +118,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
printMLText("no_docs_to_receipt");
}
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
$this->contentHeading(getMLText("group_receipt_summary"));
$printheader=true;
@ -161,8 +161,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
printMLText("no_docs_to_receipt");
}
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

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

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

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

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

@ -16,7 +16,7 @@
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
//require_once("class.Bootstrap.php");
/**
* Include class to preview documents
@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
class SeedDMS_View_RevisionSummary extends SeedDMS_Theme_Style {
function js() { /* {{{ */
header('Content-Type: application/javascript; charset=UTF-8');
@ -63,8 +63,8 @@ class SeedDMS_View_RevisionSummary 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("revision_summary"));
// $this->contentContainerStart();
@ -122,8 +122,8 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
}
// $this->contentContainerEnd();
echo "</div>\n";
echo "<div class=\"span6\">\n";
$this->columnEnd();
$this->columnStart(6);
$this->contentHeading(getMLText("group_revision_summary"));
// $this->contentContainerStart();
@ -167,8 +167,8 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
}
// $this->contentContainerEnd();
echo "</div>\n";
echo "</div>\n";
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

@ -16,7 +16,7 @@
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
//require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for RoleMgr view
@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_RoleMgr extends SeedDMS_Bootstrap_Style {
class SeedDMS_View_RoleMgr extends SeedDMS_Theme_Style {
function js() { /* {{{ */
$selrole = $this->params['selrole'];
@ -80,7 +80,7 @@ $(document).ready( function() {
$this->contentHeading(getMLText("role_info"));
$users = $selrole->getUsers();
if($users) {
echo "<table class=\"table table-condensed\"><thead><tr><th>".getMLText('name')."</th><th></th></tr></thead><tbody>\n";
echo "<table class=\"table table-condensed table-sm\"><thead><tr><th>".getMLText('name')."</th><th></th></tr></thead><tbody>\n";
foreach($users as $currUser) {
echo "<tr>";
echo "<td>";
@ -208,9 +208,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("role_management"));
$this->rowStart();
$this->columnStart(4);
?>
<div class="row-fluid">
<div class="span4">
<form class="form-horizontal">
<?php
$options = array();
@ -235,21 +235,20 @@ $(document).ready( function() {
<div class="ajax" style="margin-bottom: 15px;" data-view="RoleMgr" data-action="actionmenu" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
<?php } ?>
</div>
<div class="span8">
<?php
}
$this->columnEnd();
$this->columnStart(8);
?>
<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
<div class="well">
<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
</div>
<?php } else {
$this->errorMsg(getMLText('access_denied'));
} ?>
</div>
</div>
<?php
}
$this->rowEnd();
$this->columnEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

@ -14,7 +14,7 @@
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
//require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for SchedulerTaskMgr view
@ -25,7 +25,7 @@ require_once("class.Bootstrap.php");
* @copyright Copyright (C) 2013 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_SchedulerTaskMgr extends SeedDMS_Bootstrap_Style {
class SeedDMS_View_SchedulerTaskMgr extends SeedDMS_Theme_Style {
function js() { /* {{{ */
header('Content-Type: application/javascript');
@ -472,10 +472,8 @@ $(document).ready( function() {
$this->contentStart();
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("scheduler_task_mgr"));
?>
<div class="row-fluid">
<div class="span6">
<?php
$this->rowStart();
$this->columnStart(6);
if(!empty($GLOBALS['SEEDDMS_SCHEDULER']['tasks'])) {
echo "<table class=\"table _table-condensed\">\n";
print "<thead>\n<tr>\n";
@ -520,13 +518,14 @@ $(document).ready( function() {
}
?>
<div id="listtasks" class="ajax" data-view="SchedulerTaskMgr" data-action="tasklist"></div>
</div>
<div class="span6">
<div id="editaddtask" class="ajax" data-view="SchedulerTaskMgr" data-action="form"></div>
</div>
</div>
<?php
$this->columnEnd();
$this->columnStart(6);
?>
<div id="editaddtask" class="ajax" data-view="SchedulerTaskMgr" data-action="form"></div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

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

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

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

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

@ -16,7 +16,7 @@
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
//require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for TransmittalMgr view
@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
class SeedDMS_View_TransmittalMgr extends SeedDMS_Theme_Style {
function js() { /* {{{ */
$showtree = $this->params['showtree'];
@ -223,37 +223,30 @@ $(document).ready( function() {
<input type="hidden" name="action" value="addtransmittal">
<?php
}
?>
<table class="table-condensed">
<?php
if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'removetransmittal'))) {
?>
<tr>
<td></td>
<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
</tr>
<?php
}
?>
<tr>
<td><?php printMLText("transmittal_name");?>:</td>
<td><input type="text" name="name" value="<?php print $transmittal ? htmlspecialchars($transmittal->getName()) : "";?>"></td>
</tr>
<tr>
<td><?php printMLText("transmittal_comment");?>:</td>
<td><input type="text" name="comment" value="<?php print $transmittal ? htmlspecialchars($transmittal->getComment()) : "";?>"></td>
</tr>
<?php
$this->formField(
getMLText("name"),
array(
'element'=>'input',
'type'=>'text',
'id'=>'name',
'name'=>'name',
'value'=>($transmittal ? htmlspecialchars($transmittal->getName()) : '')
)
);
$this->formField(
getMLText("comment"),
array(
'element'=>'textarea',
'id'=>'comment',
'name'=>'comment',
'rows'=>4,
'value'=>($transmittal ? htmlspecialchars($transmittal->getComment()) : '')
)
);
if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
?>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
</tr>
<?php
$this->formSubmit("<i class=\"fa fa-save\"></i> ".($transmittal ? getMLText('save') : getMLText('add_transmittal')));
}
?>
</table>
</form>
<?php
} /* }}} */
@ -279,7 +272,7 @@ $(document).ready( function() {
if($seltransmittal) {
$items = $seltransmittal->getItems();
if($items) {
print "<table class=\"table table-condensed\">";
print "<table class=\"table table-condensed table-sm\">";
print "<thead>\n<tr>\n";
print "<th></th>\n";
print "<th>".getMLText("name")."</th>\n";
@ -326,23 +319,18 @@ $(document).ready( function() {
$accessop = $this->params['accessobject'];
$seltransmittal = $this->params['seltransmittal'];
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("my_transmittals"));
$this->globalNavigation();
$this->contentStart();
$this->pageNavigation(getMLText("my_transmittals"), "my_documents");
$this->contentHeading(getMLText("my_transmittals"));
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->contentContainerStart();
$this->rowStart();
$this->columnStart(4);
$transmittals = $dms->getAllTransmittals($user);
if ($transmittals){
print "<table class=\"table table-condensed\">";
print "<table class=\"table table-condensed table-sm\">";
print "<thead>\n<tr>\n";
print "<th>".getMLText("name")."</th>\n";
print "<th>".getMLText("comment")."</th>\n";
@ -358,6 +346,9 @@ $(document).ready( function() {
print "<td>";
print "<div class=\"list-action\">";
print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"fa fa-edit\"></i></a>";
if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'removetransmittal'))) {
print "<a data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.RemoveTransmittal.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("rm_transmittal")."\"><i class=\"fa fa-remove\"></i></a>";
}
print "</div>";
print "</td>";
print "</tr>\n";
@ -365,11 +356,8 @@ $(document).ready( function() {
print "</tbody>\n</table>\n";
}
$this->contentContainerEnd();
?>
</div>
<div class="span8">
<?php
$this->columnEnd();
$this->columnStart(8);
if($accessop->check_view_access($this, array('action'=>'form'))) {
$this->contentContainerStart();
?>
@ -382,10 +370,8 @@ $(document).ready( function() {
<div class="ajax" data-view="TransmittalMgr" data-action="items" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
<?php
}
?>
</div>
</div>
<?php
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

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

@ -490,7 +490,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
if($versions === null)
$versions = $document->getContent();
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
// $this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');
@ -589,12 +589,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
}
if(is_array($receiptStatus) && count($receiptStatus)>0) {
?>
<li class="<?php if($currenttab == 'recipients') echo 'active'; ?>"><a data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
<li class="nav-item <?php if($currenttab == 'recipients') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'recipients') echo 'active'; ?>" data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
<?php
}
if(is_array($revisionStatus) && count($revisionStatus)>0) {
?>
<li class="<?php if($currenttab == 'revision') echo 'active'; ?>"><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
<li class="nav-item <?php if($currenttab == 'revision') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'revision') echo 'active'; ?>" data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
<?php
}
?>

110
views/bootstrap4/class.Bootstrap4.php
View File

@ -407,8 +407,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <div class=\"dropdown-menu dropdown-menu-right\" aria-labelledby=\"navbarMainUser\">\n";
if (!$this->params['user']->isGuest()) {
$menuitems = array();
$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'my_documents');
$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
if ($accessobject->check_view_access('MyDocuments'))
$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'my_documents');
if ($accessobject->check_view_access('MyAccount'))
$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
if ($accessobject->check_view_access('TransmittalMgr'))
$menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals');
foreach($hookObjs as $hookObj) {
if (method_exists($hookObj, 'userMenuItems')) {
$menuitems = $hookObj->userMenuItems($this, $menuitems);
@ -701,6 +705,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
if($accessobject->check_controller_access('LockDocument'))
$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>getMLText('lock_document'));
if($document->isCheckedOut())
$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
else {
if($this->params['checkoutdir']) {
$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
}
}
if($accessobject->check_controller_access('EditDocument'))
$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
@ -712,12 +723,19 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
if($accessobject->check_controller_access('UnlockDocument'))
$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>getMLText('unlock_document'));
if($document->isCheckedOut()) {
$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
} else {
if($this->params['checkoutdir']) {
$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
}
}
if($accessobject->check_controller_access('EditDocument'))
$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
}
}
if($accessobject->maySetExpires()) {
if($accessobject->maySetExpires($document)) {
if ($accessobject->check_view_access('SetExpires'))
$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>getMLText('expires'));
}
@ -767,6 +785,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['edit_notify'] = array('link'=>"../out/out.ManageNotify.php", 'label'=>getMLText('edit_existing_notify'));
$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'2_factor_auth');
if ($this->params['enableusersview']){
if ($accessobject->check_view_access('UsrView'))
$menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>getMLText('users'));
@ -797,6 +817,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if ($accessobject->check_view_access('WorkflowSummary'))
$menuitems['workflow_summary'] = array('link'=>"../out/out.WorkflowSummary.php", 'label'=>getMLText('workflow_summary'));
}
if ($accessobject->check_view_access('ReceiptSummary'))
$menuitems['receipt_summary'] = array('link'=>"../out/out.ReceiptSummary.php", 'label'=>getMLText('receipt_summary'));
if ($accessobject->check_view_access('RevisionSummary'))
$menuitems['revision_summary'] = array('link'=>"../out/out.RevisionSummary.php", 'label'=>getMLText('revision_summary'));
/* Check if hook exists because otherwise callHook() will override $menuitems */
if($this->hasHook('mydocumentsNavigationBar'))
@ -811,14 +835,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$settings = $this->params['settings'];
$menuitems = array();
if($accessobject->check_view_access(array('UsrMgr', 'GroupMgr', 'UserList'))) {
if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
$menuitems['user_group_management'] = array('link'=>"#", 'label'=>getMLText('user_group_management'));
if ($accessobject->check_view_access('UsrMgr'))
$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>getMLText('user_management'));
if ($accessobject->check_view_access('RoleMgr'))
$menuitems['user_group_management']['children']['role_management'] = array('link'=>"../out/out.RoleMgr.php", 'label'=>getMLText('role_management'));
if ($accessobject->check_view_access('GroupMgr'))
$menuitems['user_group_management']['children']['group_management'] = array('link'=>"../out/out.GroupMgr.php", 'label'=>getMLText('group_management'));
if ($accessobject->check_view_access('UserList'))
$menuitems['user_group_management']['children']['user_list'] = array('link'=>"../out/out.UserList.php", 'label'=>getMLText('user_list'));
if ($accessobject->check_view_access('Acl'))
$menuitems['user_group_management']['children']['access_control'] = array('link'=>"../out/out.Acl.php", 'label'=>getMLText('access_control'));
}
if($accessobject->check_view_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) {
@ -872,6 +900,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>getMLText('charts'));
if ($accessobject->check_view_access('Timeline'))
$menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>getMLText('timeline'));
if ($accessobject->check_view_access('SchedulerTaskMgr'))
$menuitems['misc']['children']['schedulertaskmgr'] = array('link'=>"../out/out.SchedulerTaskMgr.php", 'label'=>getMLText('scheduler_task_mgr'));
if ($accessobject->check_view_access('ObjectCheck'))
$menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>getMLText('objectcheck'));
if ($accessobject->check_view_access('ExpiredDocuments'))
@ -884,6 +914,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>getMLText('version_info'));
}
if ($settings->_enableDebugMode) {
$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
if ($accessobject->check_view_access('Hooks'))
$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
}
/* Check if hook exists because otherwise callHook() will override $menuitems */
if($this->hasHook('admintoolsNavigationBar'))
$menuitems = $this->callHook('admintoolsNavigationBar', $menuitems);
@ -1440,12 +1476,15 @@ $(document).ready(function() {
$content .= "</select>";
return $content;
} /* }}} */
function getDocumentChooserHtml($form, $default=false, $formname='', $skiptree=false) { /* {{{ */
function getDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0, $skiptree=false) { /* {{{ */
if(!$formname)
$formname = "docid";
$formid = md5($formname.$form);
if(!$folder)
$folderid = $this->params['dms']->getRootFolder()->getId();
else
$folderid = $folder->getID();
$content = '';
$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
$content .= "<div class=\"input-group\">\n";
@ -1456,7 +1495,7 @@ $(document).ready(function() {
$content .= $this->getModalBoxLink(
array(
'target' => 'docChooser'.$formid,
'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['dms']->getRootFolder()->getId(),
'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
'title' => getMLText('document')
));
$content .= "</div>\n";
@ -1473,8 +1512,8 @@ $(document).ready(function() {
return $content;
} /* }}} */
function printDocumentChooserHtml($formName) { /* {{{ */
echo self::getDocumentChooserHtml($formName);
function printDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
echo self::getDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
} /* }}} */
/**
@ -1497,8 +1536,8 @@ function folderSelected<?php echo $formid ?>(id, name) {
<?php
} /* }}} */
function printDocumentChooser($form) { /* {{{ */
$this->printDocumentChooserHtml($form);
function printDocumentChooser($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
$this->printDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
?>
<script language="JavaScript">
<?php
@ -1767,7 +1806,7 @@ $(document).ready(function() {
$target = $dms->getDocument($objvalue);
else
$target = null;
$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $fieldname."[".$attrdef->getId()."]");
$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), M_READ, -1, $target, $fieldname."[".$attrdef->getId()."]");
break;
case SeedDMS_Core_AttributeDefinition::type_user:
$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();
@ -2031,7 +2070,7 @@ $(document).ready(function() {
* @param boolean $partialtree set to true if the given folder is the start folder
*/
function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */
function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { /* {{{ */
function jqtree($obj, $path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { /* {{{ */
$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
if($path/* || $expandtree>=$level*/) {
if($path)
@ -2047,10 +2086,12 @@ $(document).ready(function() {
$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(1 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true);
/* if the subfolder is in the path then further unfold the tree. */
if(/*$expandtree>=$level ||*/ $path && ($path[0]->getID() == $subfolder->getID())) {
$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
$node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
if($showdocs) {
$documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
if($obj->hasHook('filterTreeDocuments'))
$documents = $obj->callHook('filterTreeDocuments', $folder, $documents);
foreach($documents as $document) {
$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
$node['children'][] = $node2;
@ -2085,10 +2126,12 @@ $(document).ready(function() {
$node['load_on_demand'] = true;
$node['children'] = array();
} else {
$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 1 /*$expandtree*/, $orderby, 0);
$node['children'] = jqtree($this, $path, $folder, $this->params['user'], $accessmode, $showdocs, 1 /*$expandtree*/, $orderby, 0);
if($showdocs) {
$documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
if($this->hasHook('filterTreeDocuments'))
$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
foreach($documents as $document) {
$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
$node['children'][] = $node2;
@ -2916,6 +2959,29 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
} else {
$content .= getOverallStatusText($status["status"]);
}
if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) {
$rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
$allcomments = array('-1'=>array(), '1'=>array());
foreach ($receiptStatus as $r) {
$rstat[''.$r['status']]++;
if($r['comment']) {
// $allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
$m5 = md5(trim($r['comment']));
if(isset($allcomments[''.$r['status']][$m5]))
$allcomments[''.$r['status']][$m5]['n']++;
else
$allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment'])));
}
}
$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
if($totalreceipts) {
$content .= "
<div class=\"progress\">
<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
</div>";
}
}
$content .= "</small></td>";
// $content .= "<td>".$version."</td>";
$content .= "<td>";
@ -3301,6 +3367,12 @@ $(document).ready(function() {
case "approval":
$statusList = $latestContent->getApprovalStatus(10);
break;
case "revision":
$statusList = $latestContent->getRevisionStatus(10);
break;
case "receipt":
$statusList = $latestContent->getReceiptStatus(10);
break;
default:
$statusList = array();
}
@ -3363,6 +3435,12 @@ $(document).ready(function() {
case "approval":
echo getApprovalStatusText($rec["status"]);
break;
case "revision":
echo getRevisionStatusText($rec["status"]);
break;
case "receipt":
echo getReceiptStatusText($rec["status"]);
break;
default:
}
echo "</td>";

2
views/bootstrap4/styles/styles.css
View File

@ -17,7 +17,7 @@ ul.jqtree-tree .jqtree-title {
ul.jqtree-tree .jqtree-title.jqtree-title-folder {
margin-left: 0.3em;
}
ul.jqtree-tree .jqtree-element {
#jqtreemaintree ul.jqtree-tree .jqtree-element {
display: initial;
}