Peter M. Groen / knowledgetree

Commit 89b6a0ce30882a414f4f1734f3532ca7577ba2bb

Authored by Michael Joseph
1 parent c302c261

implemented show folder sections and status messages 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2225 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 89 additions and 98 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php
  View file @89b6a0c
... ... @@ -61,7 +61,7 @@ if (checkSession()) {
61 61 }
62 62 if ($bSuccessfulUpdate) {
63 63 $oPatternCustom = & new PatternCustom();
64   - $oPatternCustom->setHtml(getPage($fFolderID, "Folder successfully updated"));
  64 + $oPatternCustom->setHtml(getStatusPage($fFolderID, "Folder successfully updated"));
65 65 $main->setDHTMLScrolling(false);
66 66 $main->setOnLoadJavaScript("switchDiv('folderData', 'folder')");
67 67  
... ... @@ -74,7 +74,7 @@ if (checkSession()) {
74 74 $main->setDHTMLScrolling(false);
75 75 $main->setOnLoadJavaScript("switchDiv('folderData', 'folder')");
76 76  
77   - $oPatternCustom->setHtml(getPage($fFolderID, "An error occured while updating this folder"));
  77 + $oPatternCustom->setHtml(getStatusPage($fFolderID, "An error occurred while updating this folder"));
78 78 $main->setCentralPayload($oPatternCustom);
79 79 $main->setHasRequiredFields(true);
80 80 $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID"));
... ... @@ -85,7 +85,7 @@ if (checkSession()) {
85 85 //a document currently in this process
86 86 $oPatternCustom = & new PatternCustom();
87 87 $main->setDHTMLScrolling(false);
88   - $main->setOnLoadJavaScript("switchDiv('folderData', 'folder')");
  88 + $main->setOnLoadJavaScript("switchDiv('folderRouting', 'folder')");
89 89  
90 90 $oPatternCustom->setHtml(getPage($fFolderID, "You cannot edit this folder collaboration process as a document is currently undergoing this collaboration process", true));
91 91 $main->setCentralPayload($oPatternCustom);
... ... @@ -97,7 +97,7 @@ if (checkSession()) {
97 97 //a document currently in this process
98 98 $oPatternCustom = & new PatternCustom();
99 99 $main->setDHTMLScrolling(false);
100   - $main->setOnLoadJavaScript("switchDiv('folderData', 'folder')");
  100 + $main->setOnLoadJavaScript("switchDiv('folderRouting', 'folder')");
101 101  
102 102 $oPatternCustom->setHtml(getPage($fFolderID, "You cannot delete this folder collaboration process as a document is currently undergoing this collaboration process", true));
103 103 $main->setCentralPayload($oPatternCustom);
... ... @@ -109,9 +109,9 @@ if (checkSession()) {
109 109 // does this folder have a document in it that has started collaboration?
110 110 $bCollaboration = Folder::hasDocumentInCollaboration($fFolderID);
111 111 $main->setDHTMLScrolling(false);
112   - $main->setOnLoadJavaScript("switchDiv('folderData', 'folder')");
  112 + $main->setOnLoadJavaScript("switchDiv('" . (isset($fShowSection) ? $fShowSection : "folderData") . "', 'folder')");
113 113  
114   - $oPatternCustom->setHtml(getPage($fFolderID, $bCollaboration));
  114 + $oPatternCustom->setHtml(getPage($fFolderID, "", $bCollaboration));
115 115 $main->setCentralPayload($oPatternCustom);
116 116 $main->setHasRequiredFields(true);
117 117 $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID"));
... ...
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
  View file @89b6a0c
... ... @@ -16,7 +16,7 @@ function getFolderPath($iFolderID) {
16 16 global $default;
17 17 $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
18 18 $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
19   - return "<table border=\"0\" width=\"610\"><tr><td bgcolor=\"$sTDBGColour\">" . displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), "$default->rootUrl/control.php?action=browse") . "</td></tr></table>\n";
  19 + return "<table border=\"0\" cellpadding=\"0\" width=\"610\"><tr><td bgcolor=\"$sTDBGColour\">" . displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), "$default->rootUrl/control.php?action=browse") . "</td></tr></table>\n";
20 20 }
21 21  
22 22 function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") {
... ... @@ -29,10 +29,10 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = &quot;&quot;) {
29 29  
30 30 $sql = $default->db;
31 31 $sql->query($sQuery);
32   - if ($sStatusMessage) {
33   - $sToRender .= "<font color=\"red\">$sStatusMessage</font>";
34   - }
35   - $sToRender .= "<table>\n";
  32 +
  33 + $sToRender .= "<table>";
  34 + $sToRender .= "<tr><td><table cellpadding=\"5\" border=\"0\" width=\"610\">\n";
  35 + $sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n";
36 36 $sToRender .= "<caption><strong>Folder Data</strong></caption>";
37 37 if ($sql->next_record()) {
38 38 $sToRender .= "<tr>\n";
... ... @@ -40,12 +40,12 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = &quot;&quot;) {
40 40 if (Folder::folderIsUnitRootFolder($iFolderID)) {
41 41 $sToRender .= "<td>" . $sql->f("name") . "</td>\n";
42 42 } else {
43   - $sToRender .= "<td><input type=\"text\" name=\"fFolderName\" value=\"" . $sql->f("name") . "\" size=\"30\"></td>\n";
  43 + $sToRender .= "<td><input type=\"text\" name=\"fFolderName\" value=\"" . $sql->f("name") . "\" size=\"50\"></td>\n";
44 44 }
45 45 $sToRender .= "</tr>\n";
46 46 $sToRender .= "<tr>\n";
47 47 $sToRender .= "<td bgcolor=\"" . $sTDBGColour . "\">Description</td>\n";
48   - $sToRender .= "<td><input type=\"text\" name=\"fDescription\" value=\"" . $sql->f("description") . "\" size=\"30\"></td>\n";
  48 + $sToRender .= "<td><input type=\"text\" name=\"fDescription\" value=\"" . $sql->f("description") . "\" size=\"50\"></td>\n";
49 49 $sToRender .= "</tr>\n";
50 50 $sToRender .= "<tr>\n";
51 51 $sToRender .= "<td bgcolor=\"" . $sTDBGColour . "\">Public</td>\n";
... ... @@ -56,6 +56,7 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = &quot;&quot;) {
56 56 $sToRender .= "</tr>\n";
57 57  
58 58 }
  59 + $sToRender .= "</table></td></tr>";
59 60 $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fFolderID=$iFolderID&fForUpdate=1')\" border=\"0\" /></td></tr>\n";
60 61 $sToRender .= "</table>\n";
61 62  
... ... @@ -85,7 +86,7 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
85 86 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
86 87  
87 88 $sToRender .= "<table>";
88   - $sToRender .= $oPatternTableSqlQuery->render();
  89 + $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>";
89 90 if (!$bCollaboration) {
90 91 $sToRender .= "<tr>\n";
91 92 $sToRender .= "<td>\n";
... ... @@ -116,8 +117,8 @@ function getFolderDocTypes($iFolderID, $sDivName) {
116 117 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
117 118  
118 119 $sToRender .= "<table>";
119   - $sToRender .= $oPatternTableSqlQuery->render();
120   - $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=addFolderDocType&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a></td></tr>";
  120 + $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>";
  121 + $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=addFolderDocType&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a></td></tr>";
121 122 $sToRender .= "</table>";
122 123 return renderSectionDiv($sDivName, $sToRender);
123 124 }
... ... @@ -141,7 +142,7 @@ function getFolderGroupAccess($iFolderID, $sDivName) {
141 142 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
142 143  
143 144 $sToRender .= "<table>";
144   - $sToRender .= $oPatternTableSqlQuery->render();
  145 + $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>";
145 146 $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=addGroupFolderLink&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a></td></tr>";
146 147 $sToRender .= "</table>";
147 148 return renderSectionDiv($sDivName, $sToRender);
... ... @@ -149,105 +150,95 @@ function getFolderGroupAccess($iFolderID, $sDivName) {
149 150  
150 151 function renderSectionDiv($sDivName, $sHtml) {
151 152 global $default;
152   -
153   - if ( $default->browser == "ie" ) {
154   - return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:250px;left:135px;\">$sHtml</div>";
  153 +
  154 + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79"));
  155 + if ($bNN4) {
  156 + return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:350;left:135px;\">$sHtml</div>";
155 157 } else {
156   - return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:230px;left:133px;\">$sHtml</div>";
  158 + return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;left:2px;\">$sHtml</div>";
157 159 }
158 160 }
159 161  
160   -function renderFolderSection($sHeading) {
161   - return "<tr bgcolor=\"" . getColour($iColour) . "\"><td width=\"100%\">$sHeading</td></tr>\n";
  162 +function renderFolderSection($sSectionName, $sHeadingText, $bDisplayLink, $iFolderID) {
  163 + if ($bDisplayLink) {
  164 + $sLink = generateControllerLink("editFolder", "fFolderID=$iFolderID&fShowSection=$sSectionName", $sHeadingText);
  165 + } else {
  166 + $sLink = "<a href=\"javascript:void();\" onClick=\"switchDiv('$sSectionName', 'folder');\">$sHeadingText</a>";
  167 + }
  168 + return "<tr bgcolor=\"" . getColour($iColour) . "\"><td width=\"100%\">$sLink</td></tr>\n";
162 169 }
163 170  
164   -function getPage($iFolderID, $sStatusMessage = "", $bCollaboration = false) {
  171 +function getPage($iFolderID, $sStatusMessage, $bCollaboration = false) {
165 172 global $default;
166 173  
167   - if ( $default->browser == "ie" ) {
168   - $sToRender = "<div id=\"headings\" style=\"position:absolute;visibility:visible;top:120px;left:134px;\">";
169   - } else {
170   - $sToRender = "<div id=\"headings\" style=\"position:absolute;visibility:visible;top:106px;left:134px;\">";
171   - }
  174 + $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">";
  175 +
172 176 $sToRender .= renderHeading("Modify Folder Properties");
173 177 $sToRender .= getFolderPath($iFolderID);
174 178  
175   - $sToRender .= "<table border=\"0\" width=\"610\">";
176   - $sToRender .= renderFolderSection("<a href=\"javascript:void();\" onClick=\"switchDiv('folderData', 'folder');\">Folder Data</a>");
177   - $sToRender .= renderFolderSection("<a href=\"javascript:void();\" onClick=\"switchDiv('folderRouting', 'folder');\">Document Routing</a>");
178   - $sToRender .= renderFolderSection("<a href=\"javascript:void();\" onClick=\"switchDiv('documentTypes', 'folder');\">Document Types</a>");
179   - $sToRender .= renderFolderSection("<a href=\"javascript:void();\" onClick=\"switchDiv('folderPermissions', 'folder');\">Folder Permissions</a>");
180   - $sToRender .= "</table>";
  179 + $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\" id=\"headingTable\">";
  180 + $sToRender .= "<tr><td valign=\"top\">";
  181 + $sToRender .= "<table border=\"0\" width=\"610\">";
  182 +
  183 + // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable
  184 + // ie. effectively removes statusMessage on next click
  185 + $bDisplayLink = ($sStatusMessage) ? true : false;
  186 +
  187 + $sToRender .= renderFolderSection("folderData", "Folder Data", $bDisplayLink, $iFolderID);
  188 + $sToRender .= renderFolderSection("folderRouting", "Document Routing", $bDisplayLink, $iFolderID);
  189 + $sToRender .= renderFolderSection("documentTypes", "Document Types", $bDisplayLink, $iFolderID);
  190 + $sToRender .= renderFolderSection("folderPermissions", "Folder Permissions", $bDisplayLink, $iFolderID);
  191 + $sToRender .= "</table>";
  192 + $sToRender .= "</td></tr>";
  193 + $sToRender .= "</table>";
181 194 $sToRender .= "</div>";
182   -
183   - $sToRender .= getFolderData($iFolderID, "folderData", $sStatusMessage);
  195 +
  196 + // ugly netscape hacks
  197 + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79"));
  198 + if (!$bNN4) {
  199 + $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:visible;top:10px;\">";
  200 + }
  201 + if ($sStatusMessage) {
  202 + $sToRender .= "<table><tr><td><font color=\"red\">$sStatusMessage</font></td></tr></table>";
  203 + }
  204 + $sToRender .= getFolderData($iFolderID, "folderData");
184 205 $sToRender .= getFolderRouting($iFolderID, "folderRouting", $bCollaboration);
185 206 $sToRender .= getFolderDocTypes($iFolderID, "documentTypes");
186 207 $sToRender .= getFolderGroupAccess($iFolderID, "folderPermissions");
  208 + if (!$bNN4) {
  209 + $sToRender .= "</div>";
  210 + }
187 211 return $sToRender;
188 212 }
189 213  
190   -function getLeftSide($iFolderID, $bCollaboration) {
191   - global $default;
192   - $sToRender .= "<table border=\"0\" width=\"100%\">\n";
193   - $sToRender .= "<tr>\n";
194   - $sToRender .= "<td>\n";
195   - $sToRender .= getFolderData($iFolderID);
196   - $sToRender .= "</td>\n";
197   - $sToRender .= "</tr>\n";
198   - $sToRender .= "<tr>\n";
199   - $sToRender .= "<td>\n";
200   - $sToRender .= "<input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fFolderID=$iFolderID&fForUpdate=1')\" border=\"0\" />\n";
201   - $sToRender .= "</td>\n";
202   - $sToRender .= "</tr>\n";
203   - $sToRender .= "<tr>\n";
204   - $sToRender .= "<td>\n";
205   - $sToRender .= getFolderRouting($iFolderID) . "\n";
206   - $sToRender .= "</td>\n";
207   - $sToRender .= "</tr>\n";
208   - if (!$bCollaboration) {
209   - $sToRender .= "<tr>\n";
210   - $sToRender .= "<td>\n";
211   - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=addFolderCollaboration&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a>\n";
212   - $sToRender .= "</td>\n";
213   - $sToRender .= "</tr>\n";
214   - }
215   -
216   - $sToRender .= "</table>\n";
217   - return $sToRender;
218   -}
  214 +function getStatusPage($iFolderID, $sStatusMessage) {
  215 + global $default;
  216 +
  217 + $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">";
  218 + $sToRender .= renderHeading("Modify Folder Properties");
  219 + $sToRender .= getFolderPath($iFolderID);
  220 + $sToRender .= "<table border=\"0\" width=\"610\">";
219 221  
220   -function getRightSide($iFolderID) {
221   - global $default;
222   - $sToRender .= "<table border=\"0\" width=\"100%\">\n";
223   - $sToRender .= "<tr>\n";
224   - $sToRender .= "<td>\n";
225   - $sToRender .= getFolderDocTypes($iFolderID);
226   - $sToRender .= "</td>\n";
227   - $sToRender .= "</tr>\n";
228   - $sToRender .= "<tr>\n";
229   - $sToRender .= "<td>\n";
230   - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=addFolderDocType&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a>\n";
231   - $sToRender .= "</td>\n";
232   - $sToRender .= "</tr>\n";
233   -
234   - $sToRender .= "<tr>\n";
235   - $sToRender .= "<td>\n";
236   - $sToRender .= getFolderGroupAccess($iFolderID);
237   - $sToRender .= "</td>\n";
238   - $sToRender .= "</tr>\n";
239   - $sToRender .= "<tr>\n";
240   - $sToRender .= "<td>\n";
241   - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=addGroupFolderLink&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a>\n";
242   - $sToRender .= "</td>\n";
243   - $sToRender .= "</tr>\n";
244   -
245   -
246   - $sToRender .= "</table>\n";
247   - return $sToRender;
248   -}
  222 + // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable
  223 + // ie. effectively removes statusMessage on next click
  224 + $bDisplayLink = ($sStatusMessage) ? true : false;
249 225  
250   -function wrapInTable($sHtml) {
251   - return "\n\t\t\t<table border = 1, width = 100%><tr><td>$sHtml</td></tr></table>\n";
  226 + $sToRender .= renderFolderSection("folderData", "Folder Data", $bDisplayLink, $iFolderID);
  227 + $sToRender .= renderFolderSection("folderRouting", "Document Routing", $bDisplayLink, $iFolderID);
  228 + $sToRender .= renderFolderSection("documentTypes", "Document Types", $bDisplayLink, $iFolderID);
  229 + $sToRender .= renderFolderSection("folderPermissions", "Folder Permissions", $bDisplayLink, $iFolderID);
  230 +
  231 + $sToRender .= "</table>";
  232 + $sToRender .= "</div>";
  233 + // ugly netscape hacks
  234 + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79"));
  235 + if (!$bNN4) {
  236 + $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:hidden;top:10px;\">";
  237 + }
  238 + $sToRender .= getFolderData($iFolderID, "folderData", $sStatusMessage);
  239 + if (!$bNN4) {
  240 + $sToRender .= "</div>";
  241 + }
  242 + return $sToRender;
252 243 }
253 244 -?>
  245 +?>
254 246 \ No newline at end of file
... ...