sorted design of search

[catagits/Gitalist.git] / root / wrapper.tt2

diff --git a/root/wrapper.tt2 b/root/wrapper.tt2
index 4927bb8..3cef238 100755 (executable)
--- a/root/wrapper.tt2
+++ b/root/wrapper.tt2
@@ -118,13 +118,16 @@
                        <a href="[% c.uri_for('/') %]" id="logo"><img src="[% c.uri_for('/static/i/logo.png') %]" alt="Gitalist" /></a>
 
                        <div class="search">
-                               [% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %]
-                               
-                               <form method="get" action="[% c.uri_for_action('/search') %]" enctype="application/x-www-form-urlencoded">
-          <p class="projsearch">Search:
-           <input type="text" name="s" value="[% search_text %]" />
-          </p>
-         </form>
+                       [% IF Repository; INCLUDE 'nav/search.tt2'; ELSE; %]
+                       
+                       <!--
+                       [%# FIXME - Search submits to blank(ish) page %]
+                       <form method="get" action="[% c.uri_for_action('/search') %]" enctype="application/x-www-form-urlencoded">
+                          <p class="projsearch">Search:
+                           <input type="text" name="s" value="[% search_text %]" />
+                          </p>
+                       </form>
+                       -->
                        [% END %]
                        </div>
                </div>
@@ -177,26 +180,30 @@
                        
                        
                        [%- 
+                               SET actions_list = {
+                                               "blob"          => 1,
+                                               "raw"           => 1,
+                                               "blame"         => 1,
+                                               "history"       => 1,
+                                       };
+                                       
                                SET action_name = c.action.name
                                                                        .replace("_"," ")
                                                                        .replace("log", " log")
                                                                        .replace("fancy","")
                                                                        .replace("index","Repositories");
                                action_name_ucfirst = action_name FILTER ucfirst;
-                               '<a href="#" id="actions_nav_link"><span>' _ action_name_ucfirst _ '</span></a>';
+                               IF actions_list.$action_name;
+                                       '<a href="#" id="actions_nav_link"><span>' _ action_name_ucfirst _ '</span></a>';
+                               ELSE;
+                                       action_name_ucfirst;
+                               END;
                                
                        -%]
 
                        </h1>
        
                        [%- 
-                               SET actions_list = {
-                                               "blob"          => 1,
-                                               "raw"           => 1,
-                                               "blame"         => 1,
-                                               "history"       => 1,
-                                       };
-                                       
                                IF actions_list.$action_name;
                                '<ul id="actions_nav_list">';
                                        FOREACH action IN actions_list;