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

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

Browse Source
This commit is contained in:
Uwe Steinmann 2016-09-01 22:25:56 +02:00
commit 926087a448
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
styles/bootstrap/application.css
View File

@ -243,6 +243,12 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
bottom: 270px; bottom: 270px;
} }
i.initstate {color: #ff9900;}
i.released {color: #00b000;}
i.rejected {color: #b00000;}
i.in-workflow {color: #11479e;}
i.workflow-action {color: #91479e;}
@media (max-width: 480px) { @media (max-width: 480px) {
.nav-tabs > li { .nav-tabs > li {
float:none; float:none;

10
views/bootstrap/class.WorkflowGraph.php
View File

@ -337,11 +337,11 @@ div.buttons button {margin: 3px; float: right;}
<div id="preview"> <div id="preview">
<img id="png" /> <img id="png" />
<div id="legend"> <div id="legend">
<i class="icon-circle" style="color: #ff9900;"></i> <?php printMLText("workflow_initstate"); ?><br /> <i class="icon-circle initstate"></i> <?php printMLText("workflow_initstate"); ?><br />
<i class="icon-circle" style="color: #00b000;"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br /> <i class="icon-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
<i class="icon-circle" style="color: #b00000;"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br /> <i class="icon-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
<i class="icon-circle" style="color: #11479e;"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br /> <i class="icon-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
<i class="icon-sign-blank" style="color: #91479e;"></i> <?php echo printMLText('global_workflow_actions'); ?> <i class="icon-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
</div> </div>
<div class="buttons"> <div class="buttons">
<button class="btn btn-mini" id="savelayout">Save layout</button> <button class="btn btn-mini" id="savelayout">Save layout</button>

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

@ -177,14 +177,14 @@ $(document).ready(function() {
if(!$transusers && !$transgroups) { if(!$transusers && !$transgroups) {
echo " class=\"error\""; echo " class=\"error\"";
} }
echo "><td>".$state->getName()."<br />"; echo "><td>".'<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.$state->getName()."<br />";
echo $nextstate->getName();
$docstatus = $nextstate->getDocumentStatus(); $docstatus = $nextstate->getDocumentStatus();
echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.$nextstate->getName();
if($docstatus == S_RELEASED || $docstatus == S_REJECTED) { if($docstatus == S_RELEASED || $docstatus == S_REJECTED) {
echo "<br /><i class=\"icon-arrow-right\"></i> ".getOverallStatusText($docstatus); echo "<br /><i class=\"icon-arrow-right\"></i> ".getOverallStatusText($docstatus);
} }
echo "</td>"; echo "</td>";
echo "<td>".$action->getName()."</td>"; echo "<td><i class=\"icon-sign-blank workflow-action\"></i> ".$action->getName()."</td>";
echo "<td>"; echo "<td>";
foreach($transusers as $transuser) { foreach($transusers as $transuser) {
$u = $transuser->getUser(); $u = $transuser->getUser();