Commit 6d92b9b79c1debbe3b7e2bd8665342c5ecd4c521
1 parent
b8744060
intermediate ns fix for folder view page
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2247 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
31 additions
and
24 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
| 1 | <?php | 1 | <?php |
| 2 | +require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); | ||
| 2 | /** | 3 | /** |
| 3 | * $Id$ | 4 | * $Id$ |
| 4 | * | 5 | * |
| @@ -31,7 +32,7 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") { | @@ -31,7 +32,7 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") { | ||
| 31 | $sql->query($sQuery); | 32 | $sql->query($sQuery); |
| 32 | 33 | ||
| 33 | $sToRender .= "<table>"; | 34 | $sToRender .= "<table>"; |
| 34 | - $sToRender .= "<tr><td><table cellpadding=\"5\" border=\"0\" width=\"610\">\n"; | 35 | + $sToRender .= "<tr><td>"; |
| 35 | $sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n"; | 36 | $sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n"; |
| 36 | $sToRender .= "<caption><strong>Folder Data</strong></caption>"; | 37 | $sToRender .= "<caption><strong>Folder Data</strong></caption>"; |
| 37 | if ($sql->next_record()) { | 38 | if ($sql->next_record()) { |
| @@ -54,13 +55,16 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") { | @@ -54,13 +55,16 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") { | ||
| 54 | $sToRender .= "<tr>\n"; | 55 | $sToRender .= "<tr>\n"; |
| 55 | $sToRender .= "<td></td>\n"; | 56 | $sToRender .= "<td></td>\n"; |
| 56 | $sToRender .= "</tr>\n"; | 57 | $sToRender .= "</tr>\n"; |
| 58 | + $sToRender .= "<input type=\"hidden\" name=\"fFolderID\" value=\"$iFolderID\">"; | ||
| 59 | + $sToRender .= "<input type=\"hidden\" name=\fForUpdate\" value=\"1\">"; | ||
| 57 | 60 | ||
| 58 | } | 61 | } |
| 59 | $sToRender .= "</table></td></tr>"; | 62 | $sToRender .= "</table></td></tr>"; |
| 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"; | 63 | + //$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"; |
| 64 | + $sToRender .= "<tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" border=\"0\" /></td></tr>\n"; | ||
| 61 | $sToRender .= "</table>\n"; | 65 | $sToRender .= "</table>\n"; |
| 62 | 66 | ||
| 63 | - return renderSectionDiv($sDivName, $sToRender); | 67 | + return renderSectionDiv($sDivName, $sToRender); |
| 64 | } | 68 | } |
| 65 | 69 | ||
| 66 | function getFolderRouting($iFolderID, $sDivName, $bCollaboration) { | 70 | function getFolderRouting($iFolderID, $sDivName, $bCollaboration) { |
| @@ -142,21 +146,21 @@ function getFolderGroupAccess($iFolderID, $sDivName) { | @@ -142,21 +146,21 @@ function getFolderGroupAccess($iFolderID, $sDivName) { | ||
| 142 | $oPatternTableSqlQuery->setDisplayColumnHeadings(true); | 146 | $oPatternTableSqlQuery->setDisplayColumnHeadings(true); |
| 143 | 147 | ||
| 144 | $sToRender .= "<table>"; | 148 | $sToRender .= "<table>"; |
| 145 | - $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>"; | ||
| 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>"; | 149 | + $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>"; |
| 150 | + $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>"; | ||
| 147 | $sToRender .= "</table>"; | 151 | $sToRender .= "</table>"; |
| 148 | return renderSectionDiv($sDivName, $sToRender); | 152 | return renderSectionDiv($sDivName, $sToRender); |
| 149 | } | 153 | } |
| 150 | 154 | ||
| 155 | + | ||
| 151 | function renderSectionDiv($sDivName, $sHtml) { | 156 | function renderSectionDiv($sDivName, $sHtml) { |
| 152 | global $default; | 157 | global $default; |
| 153 | - | ||
| 154 | $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); | 158 | $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); |
| 155 | if ($bNN4) { | 159 | if ($bNN4) { |
| 156 | - return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:350;left:135px;\">$sHtml</div>"; | 160 | + return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:250px;left:130px;\">" . $sHtml . " </div>"; |
| 157 | } else { | 161 | } else { |
| 158 | - return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;left:2px;\">$sHtml</div>"; | ||
| 159 | - } | 162 | + return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;left:5px;\">$sHtml</div>"; |
| 163 | + } | ||
| 160 | } | 164 | } |
| 161 | 165 | ||
| 162 | function renderFolderSection($sSectionName, $sHeadingText, $bDisplayLink, $iFolderID) { | 166 | function renderFolderSection($sSectionName, $sHeadingText, $bDisplayLink, $iFolderID) { |
| @@ -169,48 +173,51 @@ function renderFolderSection($sSectionName, $sHeadingText, $bDisplayLink, $iFold | @@ -169,48 +173,51 @@ function renderFolderSection($sSectionName, $sHeadingText, $bDisplayLink, $iFold | ||
| 169 | } | 173 | } |
| 170 | 174 | ||
| 171 | function getPage($iFolderID, $sStatusMessage, $bCollaboration = false) { | 175 | function getPage($iFolderID, $sStatusMessage, $bCollaboration = false) { |
| 172 | - global $default; | ||
| 173 | - | 176 | + global $default; |
| 177 | + | ||
| 174 | $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">"; | 178 | $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">"; |
| 175 | - | ||
| 176 | $sToRender .= renderHeading("Modify Folder Properties"); | 179 | $sToRender .= renderHeading("Modify Folder Properties"); |
| 177 | $sToRender .= getFolderPath($iFolderID); | 180 | $sToRender .= getFolderPath($iFolderID); |
| 178 | - | ||
| 179 | - $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\" id=\"headingTable\">"; | 181 | + $sToRender .= "<table border=0 cellspacing=\"0\" cellpadding=\"0\" width=\"610\">"; |
| 180 | $sToRender .= "<tr><td valign=\"top\">"; | 182 | $sToRender .= "<tr><td valign=\"top\">"; |
| 181 | - $sToRender .= "<table border=\"0\" width=\"610\">"; | 183 | + $sToRender .= "<table border=\"0\" width=\"100%\">"; |
| 182 | 184 | ||
| 183 | // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable | 185 | // 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 | 186 | // ie. effectively removes statusMessage on next click |
| 185 | $bDisplayLink = ($sStatusMessage) ? true : false; | 187 | $bDisplayLink = ($sStatusMessage) ? true : false; |
| 186 | - | 188 | + |
| 187 | $sToRender .= renderFolderSection("folderData", "Folder Data", $bDisplayLink, $iFolderID); | 189 | $sToRender .= renderFolderSection("folderData", "Folder Data", $bDisplayLink, $iFolderID); |
| 188 | $sToRender .= renderFolderSection("folderRouting", "Document Routing", $bDisplayLink, $iFolderID); | 190 | $sToRender .= renderFolderSection("folderRouting", "Document Routing", $bDisplayLink, $iFolderID); |
| 189 | $sToRender .= renderFolderSection("documentTypes", "Document Types", $bDisplayLink, $iFolderID); | 191 | $sToRender .= renderFolderSection("documentTypes", "Document Types", $bDisplayLink, $iFolderID); |
| 190 | $sToRender .= renderFolderSection("folderPermissions", "Folder Permissions", $bDisplayLink, $iFolderID); | 192 | $sToRender .= renderFolderSection("folderPermissions", "Folder Permissions", $bDisplayLink, $iFolderID); |
| 193 | +// for ($i=0; $i<8; $i++) { | ||
| 194 | +// $sToRender .= "<tr><td align=\"left\"> </td></tr>\n"; | ||
| 195 | +// } | ||
| 191 | $sToRender .= "</table>"; | 196 | $sToRender .= "</table>"; |
| 192 | - $sToRender .= "</td></tr>"; | ||
| 193 | - $sToRender .= "</table>"; | 197 | + $sToRender .= "</td><td><table border=1>"; |
| 198 | + // spacing hack | ||
| 199 | +// for ($i=0; $i<8; $i++) { | ||
| 200 | +// $sToRender .= "<tr><td align=\"left\"> </td></tr>\n"; | ||
| 201 | +// } | ||
| 202 | + $sToRender .= "</table></td></tr></table>"; | ||
| 194 | $sToRender .= "</div>"; | 203 | $sToRender .= "</div>"; |
| 195 | 204 | ||
| 196 | // ugly netscape hacks | 205 | // ugly netscape hacks |
| 197 | $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); | 206 | $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); |
| 198 | if (!$bNN4) { | 207 | if (!$bNN4) { |
| 199 | - $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:visible;top:10px;\">"; | 208 | + $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:hidden;width:500px;\">"; |
| 200 | } | 209 | } |
| 201 | - if ($sStatusMessage) { | ||
| 202 | - $sToRender .= "<table><tr><td><font color=\"red\">$sStatusMessage</font></td></tr></table>"; | ||
| 203 | - } | ||
| 204 | $sToRender .= getFolderData($iFolderID, "folderData"); | 210 | $sToRender .= getFolderData($iFolderID, "folderData"); |
| 205 | $sToRender .= getFolderRouting($iFolderID, "folderRouting", $bCollaboration); | 211 | $sToRender .= getFolderRouting($iFolderID, "folderRouting", $bCollaboration); |
| 206 | $sToRender .= getFolderDocTypes($iFolderID, "documentTypes"); | 212 | $sToRender .= getFolderDocTypes($iFolderID, "documentTypes"); |
| 207 | $sToRender .= getFolderGroupAccess($iFolderID, "folderPermissions"); | 213 | $sToRender .= getFolderGroupAccess($iFolderID, "folderPermissions"); |
| 208 | if (!$bNN4) { | 214 | if (!$bNN4) { |
| 209 | $sToRender .= "</div>"; | 215 | $sToRender .= "</div>"; |
| 210 | - } | ||
| 211 | - return $sToRender; | 216 | + } |
| 217 | + return $sToRender; | ||
| 212 | } | 218 | } |
| 213 | 219 | ||
| 220 | + | ||
| 214 | function getStatusPage($iFolderID, $sStatusMessage) { | 221 | function getStatusPage($iFolderID, $sStatusMessage) { |
| 215 | global $default; | 222 | global $default; |
| 216 | 223 |