Merge pull request #1 from friendica/develop

[friendica.git] / view / templates / searchbox.tpl

diff --git a/view/templates/searchbox.tpl b/view/templates/searchbox.tpl
index 38d282a8c9812849c3a4c73af672a6a4b809590b..8317c59b1d4620d4551a7ba91e9a87462124b8e4 100644 (file)
--- a/view/templates/searchbox.tpl
+++ b/view/templates/searchbox.tpl
@@ -1,20 +1,18 @@
 <div id="{{$id}}" class="input-group">
-        <form action="{{$action_url}}" method="get" >
-                {{strip}}
-                <input type="text" name="search" id="search-text" placeholder="{{$search_label}}" value="{{$s}}" autofocus />
-                {{if $searchoption}}
+       <form action="search" method="get">
+{{strip}}
+               <input type="text" name="q" id="search-text" placeholder="{{$search_label}}" value="{{$s}}">
+    {{if $search_options}}
                <select name="search-option" id="search-options">
-                       <option value="fulltext">{{$searchoption.0}}</option>
-                       <option value="tags">{{$searchoption.1}}</option>
-                       <option value="contacts">{{$searchoption.2}}</option>
-                       {{if $searchoption.3}}<option value="forums">{{$searchoption.3}}</option>{{/if}}
+               {{foreach $search_options as $value => $label}}
+                       <option value="{{$value}}">{{$label}}</option>
+               {{/foreach}}
                </select>
-               {{/if}}
-
-                <input type="submit" name="submit" id="search-submit" value="{{$search_label}}" />
-                {{if $savedsearch}}
-                <input type="submit" name="save" id="search-save" value="{{$save_label}}" />
-                {{/if}}
-                {{/strip}}
-        </form>
+    {{/if}}
+               <input type="submit" name="submit" id="search-submit" value="{{$search_label}}"/>
+    {{if $s}}
+           <a href="search/saved/add?term={{$q}}&amp;return_url={{$return_url}}">{{$save_label}}</a>
+    {{/if}}
+{{/strip}}
+       </form>
 </div>