Commit 63e6dad3d9fba93b1420843f0e76a2468c8609af
1 parent
052a36e4
Changed presentation
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1338 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
13 additions
and
8 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationUI.inc
| ... | ... | @@ -43,21 +43,23 @@ function getRole($iRoleID) { |
| 43 | 43 | |
| 44 | 44 | function getDocumentRoutingPage($iGroupID, $iUserID, $iRoleID, $iSequenceNumber, $fDocumentID) { |
| 45 | 45 | global $default; |
| 46 | + $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); | |
| 47 | + $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); | |
| 48 | + $sTHBGColour = $default->siteMap->getSectionColour($sSectionName, "th"); | |
| 46 | 49 | return "<table cellspacing=2, cellpadding=2, border=0>\n" . |
| 47 | 50 | "<caption><b>Document Routing</b></caption>\n" . |
| 48 | 51 | "<tr>\n" . |
| 49 | - "<td><b>Group</b></td><td>".getGroupRow($iGroupID)."</td>\n" . | |
| 52 | + "<td bgcolor=\"$sTDBGColour\"><b>Group</b></td><td>".getGroupRow($iGroupID)."</td>\n" . | |
| 50 | 53 | "</tr>\n" . |
| 51 | - "<tr>\n" . | |
| 52 | - //"<td><b>Role</b></td><td>".getRoleDropDown($iRoleID)."</td>\n" . | |
| 53 | - "<td><b>Role</b></td><td>".getRole($iRoleID)."</td>\n" . | |
| 54 | + "<tr>\n" . | |
| 55 | + "<td bgcolor=\"$sTDBGColour\"><b>Role</b></td><td bgcolor=\"F5F6EE\">".getRole($iRoleID)."</td>\n" . | |
| 54 | 56 | "</tr>\n" . |
| 55 | 57 | "<tr>\n" . |
| 56 | - "<td><b>Player</b></td><td>".getUserDropDown($iGroupID, $iUserID)."</td>\n" . | |
| 58 | + "<td bgcolor=\"$sTDBGColour\"><b>Player</b></td><td>".getUserDropDown($iGroupID, $iUserID)."</td>\n" . | |
| 57 | 59 | "</tr>\n" . |
| 58 | 60 | "<tr>\n" . |
| 59 | 61 | "<tr>\n" . |
| 60 | - "<td><b>Seq. no.</b></td><td>$iSequenceNumber</td>\n" . | |
| 62 | + "<td bgcolor=\"$sTDBGColour\"><b>Seq. no.</b></td><td bgcolor=\"F5F6EE\">$iSequenceNumber</td>\n" . | |
| 61 | 63 | "</tr>\n" . |
| 62 | 64 | "<tr>\n" . |
| 63 | 65 | "<td colspan=\"2\"> </td>\n" . | ... | ... |
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
| ... | ... | @@ -161,8 +161,11 @@ function getEditPage($oDocument) { |
| 161 | 161 | if ((!Document::documentCollaborationStarted($oDocument->getID())) && ($_SESSION["userID"] == $oDocument->getCreatorID())) { |
| 162 | 162 | //if not all collaboration steps have been set, then you cannot start the collaboration process |
| 163 | 163 | //only the creator of the document can start the collaboration process |
| 164 | - $sToRender .= "\t\t<td><a href=" . $_SERVER['PHP_SELF'] . "?fDocumentID=" . $oDocument->getID() . "&fBeginCollaboration=1><img src=\"$default->graphicsUrl/widgets/begin.gif\" border=\"0\"/></a>". | |
| 165 | - "<a href=" . $_SERVER['PHP_SELF'] . "?fDocumentID=" . $oDocument->getID() . "&fPublish=1><img src=\"$default->graphicsUrl/widgets/begin.gif\" border=\"0\"/></a></td>\n"; | |
| 164 | + $sToRender .= "\t\t<td><a href=" . $_SERVER['PHP_SELF'] . "?fDocumentID=" . $oDocument->getID() . "&fBeginCollaboration=1><img src=\"$default->graphicsUrl/widgets/begin.gif\" border=\"0\"/></a>"; | |
| 165 | + if (!Document::documentIsPendingWebPublishing($iDocumentID)) { | |
| 166 | + $sToRender .= "<a href=" . $_SERVER['PHP_SELF'] . "?fDocumentID=" . $oDocument->getID() . "&fForPublish=1><img src=\"$default->graphicsUrl/widgets/publish.gif\" border=\"0\"/></a>\n"; | |
| 167 | + } | |
| 168 | + $sToRender .= "</td>\n"; | |
| 166 | 169 | } else if (Document::userIsPerformingCurrentCollaborationStep($oDocument->getID())) { |
| 167 | 170 | //if the current user is responsible for an active step in the collaboration process |
| 168 | 171 | $sToRender .= "\t\t<td><table border=\"0\"><tr>\n"; | ... | ... |