Peter M. Groen / knowledgetree

Commit 9b0c8f0c1de01474cc88a514f61b98eafe28f0d9

Authored by Michael Joseph
1 parent fa0dab87

formatted 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@867 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 73 additions and 78 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
  View file @9b0c8f0
@@ -9,45 +9,43 @@ @@ -9,45 +9,43 @@
9 * 9 *
10 */ 10 */
11 11
12 -function renderBrowseAddPage($fFolderID) {  
13 - global $default;  
14 - $sToRender = "<table border=\"0\">\n";  
15 - $sToRender .= "<tr>\n";  
16 - $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->owl_ui_directory/foldermanagement/addFolderBL.php") . "</td>\n";  
17 - $sToRender .= "</tr>\n";  
18 - $sToRender .= "</table>\n";  
19 - $sToRender .= "<table border=\"0\">\n";  
20 - $sToRender .= "<tr>\n";  
21 - $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n";  
22 - $sToRender .= "</tr>\n";  
23 - $sToRender .= "</table><br>\n";  
24 - $sToRender .= "<table border=\"0\">\n";  
25 - $sToRender .= "<tr>\n";  
26 - $sToRender .= "<td colspan=\"2\"><b>New folder name:<b></td>\n";  
27 - $sToRender .= "</tr>\n";  
28 - $sToRender .= "<td><input type=\"text\" name=\"fFolderName\" value=\"\" /></td>\n";  
29 - $sToRender .= "<td><input type=\"image\" src=\"$default->owl_graphics_url/widgets/add.gif\"></td>\n";  
30 - $sToRender .= "</tr>\n";  
31 - $sToRender .= "</table>\n";  
32 -  
33 - return $sToRender;  
34 -} 12 +function renderBrowseAddPage($fFolderID) {
  13 + global $default;
  14 + $sToRender = "<table border=\"0\">\n";
  15 + $sToRender .= "<tr>\n";
  16 + $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->owl_ui_directory/foldermanagement/addFolderBL.php") . "</td>\n";
  17 + $sToRender .= "</tr>\n";
  18 + $sToRender .= "</table>\n";
  19 + $sToRender .= "<table border=\"0\">\n";
  20 + $sToRender .= "<tr>\n";
  21 + $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n";
  22 + $sToRender .= "</tr>\n";
  23 + $sToRender .= "</table><br>\n";
  24 + $sToRender .= "<table border=\"0\">\n";
  25 + $sToRender .= "<tr>\n";
  26 + $sToRender .= "<td colspan=\"2\"><b>New folder name:<b></td>\n";
  27 + $sToRender .= "</tr>\n";
  28 + $sToRender .= "<td><input type=\"text\" name=\"fFolderName\" value=\"\" /></td>\n";
  29 + $sToRender .= "<td><input type=\"image\" src=\"$default->owl_graphics_url/widgets/add.gif\"></td>\n";
  30 + $sToRender .= "</tr>\n";
  31 + $sToRender .= "</table>\n";
35 32
36 -function renderBrowsePage($fFolderID) {  
37 - global $default;  
38 - $sToRender = "<table border=\"0\">\n";  
39 - $sToRender .= "<tr>\n";  
40 - $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->owl_ui_directory/foldermanagement/addFolderBL.php") . "</td>\n";  
41 - $sToRender .= "</tr>\n";  
42 - $sToRender .= "</table>\n";  
43 - $sToRender .= "<table border=\"0\">\n";  
44 - $sToRender .= "<tr>\n";  
45 - $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n";  
46 - $sToRender .= "</tr>\n";  
47 - $sToRender .= "</table><br>\n";  
48 -  
49 - return $sToRender; 33 + return $sToRender;
50 } 34 }
51 35
  36 +function renderBrowsePage($fFolderID) {
  37 + global $default;
  38 + $sToRender = "<table border=\"0\">\n";
  39 + $sToRender .= "<tr>\n";
  40 + $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->owl_ui_directory/foldermanagement/addFolderBL.php") . "</td>\n";
  41 + $sToRender .= "</tr>\n";
  42 + $sToRender .= "</table>\n";
  43 + $sToRender .= "<table border=\"0\">\n";
  44 + $sToRender .= "<tr>\n";
  45 + $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n";
  46 + $sToRender .= "</tr>\n";
  47 + $sToRender .= "</table><br>\n";
52 48
  49 + return $sToRender;
  50 +}
53 ?> 51 ?>
presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
  View file @9b0c8f0
@@ -20,23 +20,23 @@ @@ -20,23 +20,23 @@
20 * @param string the page to link to (defaults to the page this is called from) 20 * @param string the page to link to (defaults to the page this is called from)
21 */ 21 */
22 function displayFolderPathLink($aPathArray, $sLinkPage = "") { 22 function displayFolderPathLink($aPathArray, $sLinkPage = "") {
23 - global $default;  
24 - if (strlen($sLinkPage) == 0) {  
25 - $sLinkPage = $_SERVER["PHP_SELF"];  
26 - }  
27 - $default->log->debug("displayFolderPathLink: slinkPage=$sLinkPage");  
28 - // display a separate link to each folder in the path  
29 - for ($i=0; $i<count($aPathArray); $i++) {  
30 - $iFolderID = $aPathArray[$i];  
31 - // retrieve the folder name for this folder  
32 - $sFolderName = Folder::getFolderName($iFolderID);  
33 - // generate a link back to this page setting fFolderID  
34 - $sLink = generateLink($sLinkPage,  
35 - "fBrowseType=folder&fFolderID=$iFolderID",  
36 - $sFolderName);  
37 - $sPathLinks = (strlen($sPathLinks) > 0) ? $sPathLinks . " > " . $sLink : $sLink;  
38 - }  
39 - return $sPathLinks; 23 + global $default;
  24 + if (strlen($sLinkPage) == 0) {
  25 + $sLinkPage = $_SERVER["PHP_SELF"];
  26 + }
  27 + $default->log->debug("displayFolderPathLink: slinkPage=$sLinkPage");
  28 + // display a separate link to each folder in the path
  29 + for ($i=0; $i<count($aPathArray); $i++) {
  30 + $iFolderID = $aPathArray[$i];
  31 + // retrieve the folder name for this folder
  32 + $sFolderName = Folder::getFolderName($iFolderID);
  33 + // generate a link back to this page setting fFolderID
  34 + $sLink = generateLink($sLinkPage,
  35 + "fBrowseType=folder&fFolderID=$iFolderID",
  36 + $sFolderName);
  37 + $sPathLinks = (strlen($sPathLinks) > 0) ? $sPathLinks . " > " . $sLink : $sLink;
  38 + }
  39 + return $sPathLinks;
40 } 40 }
41 41
42 42
@@ -48,9 +48,9 @@ function displayFolderPathLink($aPathArray, $sLinkPage = &quot;&quot;) { @@ -48,9 +48,9 @@ function displayFolderPathLink($aPathArray, $sLinkPage = &quot;&quot;) {
48 */ 48 */
49 function displayFolderLink($oFolder, $sLinkPage = "") { 49 function displayFolderLink($oFolder, $sLinkPage = "") {
50 global $default; 50 global $default;
51 - 51 +
52 if (strlen($sLinkPage) == 0) { 52 if (strlen($sLinkPage) == 0) {
53 - $sLinkPage = $_SERVER["PHP_SELF"]; 53 + $sLinkPage = $_SERVER["PHP_SELF"];
54 } 54 }
55 55
56 $sFolderIconPath = generateImage($default->owl_graphics_url . "/widgets/dfolder.gif"); 56 $sFolderIconPath = generateImage($default->owl_graphics_url . "/widgets/dfolder.gif");
@@ -60,9 +60,9 @@ function displayFolderLink($oFolder, $sLinkPage = &quot;&quot;) { @@ -60,9 +60,9 @@ function displayFolderLink($oFolder, $sLinkPage = &quot;&quot;) {
60 $oFolder->getName()); 60 $oFolder->getName());
61 } 61 }
62 62
63 -function renderFolderPath($fFolderID, $sLinkURL) {  
64 - $sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($fFolderID, $sLinkURL));  
65 - return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n"; 63 +function renderFolderPath($fFolderID, $sLinkURL) {
  64 + $sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($fFolderID, $sLinkURL));
  65 + return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n";
66 } 66 }
67 67
68 /** 68 /**
@@ -73,25 +73,22 @@ function renderFolderPath($fFolderID, $sLinkURL) { @@ -73,25 +73,22 @@ function renderFolderPath($fFolderID, $sLinkURL) {
73 * @return String HTML table 73 * @return String HTML table
74 */ 74 */
75 function renderFolderList($fFolderID, $sLinkURL) { 75 function renderFolderList($fFolderID, $sLinkURL) {
76 - global $default;  
77 - $sQuery = "SELECT F.id AS id, F.name AS name " .  
78 - "FROM $default->owl_folders_table AS F " .  
79 - "WHERE F.parent_id = " . $fFolderID . " " .  
80 - "ORDER BY F.name ASC";  
81 -  
82 - $aColumns = array("name");  
83 - $aColumnTypes = array(3);  
84 - $aColumnHeaderNames = array("Folder");  
85 - $aDBColumns = array("id");  
86 - $aQueryStringVariableNames = array("fFolderID");  
87 - $aLinkURLs = array("$default->owl_root_url/$sLinkURL");  
88 -  
89 - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", $aLinkURLs, $aDBColumns, $aQueryStringVariableNames);  
90 - $oPatternTableSqlQuery->setImageURL("$default->owl_graphics_url/widgets/dfolder.gif");  
91 - $oPatternTableSqlQuery->setEmptyTableMessage("This folder contains no sub folders");  
92 - return $oPatternTableSqlQuery->render();  
93 -}  
94 - 76 + global $default;
  77 + $sQuery = "SELECT F.id AS id, F.name AS name " .
  78 + "FROM $default->owl_folders_table AS F " .
  79 + "WHERE F.parent_id = " . $fFolderID . " " .
  80 + "ORDER BY F.name ASC";
95 81
  82 + $aColumns = array("name");
  83 + $aColumnTypes = array(3);
  84 + $aColumnHeaderNames = array("Folder");
  85 + $aDBColumns = array("id");
  86 + $aQueryStringVariableNames = array("fFolderID");
  87 + $aLinkURLs = array("$default->owl_root_url/$sLinkURL");
96 88
  89 + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", $aLinkURLs, $aDBColumns, $aQueryStringVariableNames);
  90 + $oPatternTableSqlQuery->setImageURL("$default->owl_graphics_url/widgets/dfolder.gif");
  91 + $oPatternTableSqlQuery->setEmptyTableMessage("This folder contains no sub folders");
  92 + return $oPatternTableSqlQuery->render();
  93 +}
97 ?> 94 ?>