Peter M. Groen / knowledgetree

Commit 5fd1847b41414841d450ec042aa9b69159272e2f

Authored by conradverm
1 parent 130b90b1

KTS-2457 

"On search results page - move save search out of the collapsable area"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7397 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 17 additions and 17 deletions
templates/ktcore/search2/search_results.smarty
  View file @5fd1847
... ... @@ -4,7 +4,6 @@
4 4 <div class="collapsible">
5 5 <h4 onclick="toggleElementClass('expanded', this.parentNode)">{i18n}Search Expression{/i18n}</h4>
6 6 <div class="collapsiblebody">
7   -
8 7 <fieldset>
9 8 <legend>{i18n}Search Expression{/i18n}</legend>
10 9 {$txtQuery}
... ... @@ -99,6 +98,8 @@ function onShowAll(showall)
99 98  
100 99 </script>
101 100 {/literal}
  101 +</div>
  102 +</div>
102 103 {if empty($iSavedID)}
103 104 <div id="saveSearch">
104 105 <fieldset>
... ... @@ -108,8 +109,8 @@ function onShowAll(showall)
108 109 </fieldset>
109 110 </div>
110 111 {/if}
111   -</div>
112   -</div>
  112 +
  113 +
113 114 <fieldset>
114 115  
115 116 <legend>{i18n}Search Results{/i18n}</legend>
... ... @@ -132,8 +133,6 @@ function onShowAll(showall)
132 133 {assign var=cbid value=0}
133 134  
134 135 {foreach item=document from=$results}
135   -
136   - {if $document->IsLive}
137 136 <tr><td>
138 137 <input type="checkbox" name="selection_d[]" id="cb{$cbid}" value="{$document->DocumentID}"><nobr><a href="view.php?fDocumentId={$document->DocumentID}"><B>{$document->Title}</b></a>
139 138 {if $document->Title != $document->Filename}
... ... @@ -150,36 +149,35 @@ function onShowAll(showall)
150 149 <font style=" color: orange ">{i18n}Version:{/i18n} {$document->Version}</font></td>
151 150 </tr>
152 151 <tr><td colspan=2>{$document->Text}</td></tr>
153   - <tr><td><font style=" color: green ">{$document->FullPath}/{$document->Title} - {$document->Filesize}</font></td>
  152 + <tr><td><font style=" color: green "><a href="{$rootUrl}/browse.php?fFolderId={$document->FolderId}">{$document->FullPath}</a>/{$document->Title} - {$document->Filesize}</font></td>
154 153 <td align=right><nobr>
155 154 <font style="color: orange ">
156   - {i18n}Created By:{/i18n} Conrad Vermeulen
157   - {i18n}on{/i18n} 2007-09-28
  155 + {i18n}Created By:{/i18n} {$document->CreatedBy}
  156 + {i18n}on{/i18n} {$document->DateCreated}
158 157 </font>
159 158 </td>
160   - {assign var=workflow value=$document->Workflow}
161   - {if $workflow != '' || $this->Document->IsCheckedOut}
  159 +
  160 +
162 161 <tr><td>
163 162 {if $workflow != ''}
164   - <font style="color: orange ">{i18n}Workflow:{/i18n} {$workflow}</font>
  163 + <font style="color: orange ">{i18n}Workflow:{/i18n} $document->Workflow}</font>
165 164 {/if}
166 165 </td>
167 166 <td align=right><nobr>
168 167 <font style="color: brown ">
169 168 {if $document->CheckedOutUser != ''}
170   - {i18n}Checked out by:{/i18n} {$document->CheckedOutUser}
171   - {i18n}on{/i18n} 2007-09-28
  169 + <b>{i18n}Checked out by:{/i18n} {$document->CheckedOutUser}
  170 + {i18n}on{/i18n} {$document->DateCheckedOut}</b>
172 171 {else}
173   - {i18n}Modified by:{/i18n} Conrad Vermeulen
174   - {i18n}on{/i18n} 2007-09-28
  172 + {i18n}Modified by:{/i18n} {$document->ModifiedBy}
  173 + {i18n}on{/i18n} {$document->DateModified}
175 174 {/if}
176 175 </font>
177 176 </td>
178   - {/if}
  177 +
179 178 <tr><td colspan=2><br></br></td></tr></tr>
180 179  
181 180 {assign var=cbid value=$cbid+1}
182   - {/if}
183 181 {/foreach}
184 182  
185 183 <tr><td>
... ... @@ -197,9 +195,11 @@ function onShowAll(showall)
197 195 <input type="hidden" name="fReturnAction" value="search2" />
198 196 <input type="hidden" name="fReturnData" value="1" />
199 197  
  198 + <nobr>
200 199 {foreach from=$bulkactions item=bulkaction}
201 200 <input type="submit" name="submit[{$bulkaction->getName()}]" value="{$bulkaction->getDisplayName()}" />
202 201 {/foreach}
  202 + </nobr>
203 203 </table>
204 204 </form>
205 205  
... ...