Peter M. Groen / knowledgetree

Commit ded5be5c99bdca2122a2bdaef0bbdd8e280b4180

Authored by nbm
1 parent 8b459390

Remove old-style advanced search user interface. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3189 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 16 additions and 60 deletions
presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
  View file @ded5be5
@@ -66,16 +66,6 @@ function getMetaData($aMetaTagIDs) { @@ -66,16 +66,6 @@ function getMetaData($aMetaTagIDs) {
66 return $sToRender; 66 return $sToRender;
67 } 67 }
68 68
69 -function renderSearchSection($sSectionName, $sHeadingText, $bDisplayLink) {  
70 - static $iColour;  
71 - if ($bDisplayLink) {  
72 - $sLink = generateControllerLink("advancedSearch", "fShowSection=$sSectionName", $sHeadingText);  
73 - } else {  
74 - $sLink = "<a href=\"#\" onClick=\"switchDiv('$sSectionName', 'search');\">$sHeadingText</a>";  
75 - }  
76 - return "<tr bgcolor=\"" . getColour($iColour) . "\"><td width=\"100%\">$sLink</td></tr>\n";  
77 -}  
78 -  
79 function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading = null, $bSearchArchive = false) { 69 function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading = null, $bSearchArchive = false) {
80 global $default; 70 global $default;
81 if (is_null($sHeading)) { 71 if (is_null($sHeading)) {
@@ -84,68 +74,33 @@ function getSearchPage($sSearchString = &quot;&quot;, $aMetaTagIDs = array(), $sHeading = @@ -84,68 +74,33 @@ function getSearchPage($sSearchString = &quot;&quot;, $aMetaTagIDs = array(), $sHeading =
84 74
85 $sToRender = renderHeading($sHeading); 75 $sToRender = renderHeading($sHeading);
86 76
87 - $sToRender .= "<div id=\"headings\">\n";  
88 - $sToRender .= "<table width=\"100%\">";  
89 - $sToRender .= renderSearchSection("searchLess", _("Simpler Search"), false);  
90 - $sToRender .= renderSearchSection("searchMore", _("More Options"), false);  
91 - $sToRender .= "</table>";  
92 - $sToRender .= "</div>";  
93 -  
94 - $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:hidden;width:500px;\" >\n";  
95 -  
96 - $sToRender .= "<div id=\"searchLess\" style=\"position:absolute;visibility:hidden;left:5px;\" >\n";  
97 -  
98 - $sToRender .= "<table width=\"600\">\n";  
99 - $sToRender .= "<tr>\n";  
100 - $sToRender .= "<td>" . _("Search text:") . " <input type=\"text\" size=\"50\" name=\"fSearchString\" value=\"$sSearchString\" />\n";  
101 - $sToRender .= "<input name=\"simpleSearch\" type=\"image\" src=\"" . KTHtml::getSearchButton() . "\" border=\"0\"/></td>\n";  
102 - $sToRender .= "</tr>\n";  
103 -  
104 - if ($bSearchArchive) {  
105 - $sToRender .= "<input type=\"hidden\" name=\"fToSearch\" value=\"Archived\"/>";  
106 - } else {  
107 - $sToRender .= "<tr>\n";  
108 - $sToRender .= "<td>&nbsp</td>\n";  
109 - $sToRender .= "</tr>\n";  
110 - $sToRender .= "<tr><td>" . _("Search") . ": <select name=\"fToSearch\"><option value=\"Live\">" . _("Live") . "</option><option value=\"Archived\">" . _("Archived") . "</option></select> " . _("Documents") . "</td></tr>";  
111 - }  
112 -  
113 - $sToRender .= "<tr>\n";  
114 - $sToRender .= "<td>&nbsp</td>\n";  
115 - $sToRender .= "</tr>\n";  
116 - $sToRender .= "<tr>\n";  
117 - $sToRender .= "<td>" . getMetaData($aMetaTagIDs) . "</td>\n";  
118 - $sToRender .= "</tr>\n";  
119 - $sToRender .= "<tr>\n";  
120 - $sToRender .= "<td>&nbsp</td>\n";  
121 - $sToRender .= "</tr>\n";  
122 - $sToRender .= "</table>\n";  
123 - $sToRender .= "</div>";  
124 -  
125 -  
126 - $sToRender .= "<div id=\"searchMore\" style=\"position:absolute;visibility:hidden;left:5px;\">";  
127 -  
128 $sToRender .= "<form name=\"advancedSearch\" method=\"POST\">"; 77 $sToRender .= "<form name=\"advancedSearch\" method=\"POST\">";
129 78
130 $sToRender .= "<table width=\"100%\">\n"; 79 $sToRender .= "<table width=\"100%\">\n";
131 - $sToRender .= "<tr><td colspan=\"2\"><h3>Built-in metadata</h3></td></tr>"; 80 + $sToRender .= "<tr><td colspan=\"2\"><h3>" . _("Document Data") . "</h3></td></tr>";
132 $aBaseCriteria = Criteria::getBaseCriteria(); 81 $aBaseCriteria = Criteria::getBaseCriteria();
133 foreach ($aBaseCriteria as $k => $v) { 82 foreach ($aBaseCriteria as $k => $v) {
134 $sToRender .= $v->searchDisplay($_REQUEST); 83 $sToRender .= $v->searchDisplay($_REQUEST);
135 } 84 }
136 - $sToRender .= "<tr><td colspan=\"2\"><h3>Generic metadata</h3></td></tr>"; 85 + $sToRender .= "<tr><td colspan=\"2\"><h3>" . _("Document Fields") . "</h3></td></tr>";
137 $aGenericCriteria = Criteria::getGenericCriteria(); 86 $aGenericCriteria = Criteria::getGenericCriteria();
138 foreach ($aGenericCriteria as $k => $v) { 87 foreach ($aGenericCriteria as $k => $v) {
139 $sToRender .= $v->searchDisplay($_REQUEST); 88 $sToRender .= $v->searchDisplay($_REQUEST);
140 } 89 }
  90 +
  91 + if ($bSearchArchive) {
  92 + $sToRender .= "<input type=\"hidden\" name=\"fToSearch\" value=\"Archived\"/>";
  93 + } else {
  94 + $sToRender .= "<tr>\n";
  95 + $sToRender .= "<td>&nbsp</td>\n";
  96 + $sToRender .= "</tr>\n";
  97 + $sToRender .= "<tr><td>" . _("Search") . ": <select name=\"fToSearch\"><option value=\"Live\">" . _("Live") . "</option><option value=\"Archived\">" . _("Archived") . "</option></select> " . _("Documents") . "</td></tr>";
  98 + }
  99 +
141 $sToRender .= "</table>\n"; 100 $sToRender .= "</table>\n";
142 - $sToRender .= "<input name=\"advancedSearch\" type=\"image\" src=\"" . KTHtml::getSearchButton() . "\" border=\"0\"/></td>\n"; 101 + $sToRender .= "<input name=\"advancedSearch\" type=\"image\" src=\"" . KTHtml::getSearchButton() . "\" border=\"0\"/>\n";
143 $sToRender .= "</form>"; 102 $sToRender .= "</form>";
144 103
145 - $sToRender .= "</div>";  
146 - $sToRender .= "</div>";  
147 -  
148 -  
149 return $sToRender . getSearchValidationJavaScript(); 104 return $sToRender . getSearchValidationJavaScript();
150 } 105 }
151 106
@@ -196,8 +151,9 @@ function getSearchValidationJavaScript() { @@ -196,8 +151,9 @@ function getSearchValidationJavaScript() {
196 $sToRender .= "\t\treturn false;\n\t}\n"; 151 $sToRender .= "\t\treturn false;\n\t}\n";
197 $sToRender .= "\treturn true;\n}\n"; 152 $sToRender .= "\treturn true;\n}\n";
198 $sToRender .= "-->\n"; 153 $sToRender .= "-->\n";
199 - $sToRender .= "</SCRIPT>\n\n";*/  
200 - return $sToRender; 154 + $sToRender .= "</SCRIPT>\n\n";
  155 + return $sToRender;*/
  156 + return "";
201 } 157 }
202 158
203 function wasSelected($iID, $aMetaTagIDs) { 159 function wasSelected($iID, $aMetaTagIDs) {