Switch order of sha1's in 'compare' so hilighted in the correct order

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

diff --git a/root/wrapper.tt2 b/root/wrapper.tt2
index 545e7b3..7006bbb 100755 (executable)
--- a/root/wrapper.tt2
+++ b/root/wrapper.tt2
@@ -44,8 +44,69 @@
                                }
                        }
                }
-               document.location.href = "[% c.uri_for("/") %]" + repo + "/"+ sha1 + "/diff/" + sha2 + "/" + path;
+               document.location.href = "[% c.uri_for("/") %]" + repo + "/"+ sha2 + "/diff/" + sha1 + "/" + path;
        }
+       // handles hover sub menus in IE
+       startList = function() {
+               if (document.getElementById && document.getElementById("actions_nav_link")) {
+                       var navList = document.getElementById("actions_nav_list");
+                       var navLink = document.getElementById("actions_nav_link");
+                       // assign event handlers to each element
+                       navLink.onmouseover=function() {
+                               setNavClass(navList);
+                       }
+                       navList.onmouseover=function() {
+                               setNavClass(navList);
+                       }
+                       navList.onmouseout=function() {
+                               navList.className=navList.className.replace(" actions_nav_list_over", "");
+                       }
+                       navLink.onmouseout=function() {
+                               navList.className=navList.className.replace(" actions_nav_list_over", "");
+                       }
+               }
+               
+       }
+       function setNavClass(el){
+               var link_el = document.getElementById("actions_nav_link");
+               var offsetAry = findPos(link_el);
+               // set position of list
+               el.style.left = offsetAry[0]+"px";
+               el.style.top = offsetAry[1]+30 +"px";
+               el.className+=" actions_nav_list_over";
+       }
+       
+       function addLoadListener(fn){ 
+               if (typeof window.addEventListener != 'undefined') { 
+                       window.addEventListener('load', fn, false); 
+               }else if (typeof document.addEventListener != 'undefined'){ 
+                       document.addEventListener('load', fn, false); 
+               }else if (typeof window.attachEvent != 'undefined'){ 
+                       window.attachEvent('onload', fn); 
+               }else{ 
+                       var oldfn = window.onload; 
+                       if (typeof window.onload != 'function'){ 
+                               window.onload = fn; 
+                       }else{ 
+                               window.onload = function(){
+                                       oldfn();
+                                       fn();
+                               }; 
+                       }
+               }
+       }
+       function findPos(obj) {
+               var curleft = curtop = 0;
+               if (obj.offsetParent) {
+               do {
+                       curleft += obj.offsetLeft;
+                       curtop += obj.offsetTop;
+               } 
+               while (obj = obj.offsetParent);
+               return [curleft,curtop];
+               }
+       }
+       addLoadListener(startList);
        </script>
 </head>
 
@@ -57,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>
@@ -82,10 +146,8 @@
 
                                
                                <li id="branch_selector">
-                                       [%# FIXME: convert to c.uri_for_action  #%]
-                                       
                                        Branches 
-                                       <select onchange="document.location.href='/[% Repository.name %]/'+this.options[this.selectedIndex].text + '/shortlog';">
+                                       <select onchange="document.location.href='[% c.uri_for("/") %][% Repository.name %]/'+this.options[this.selectedIndex].text + '/shortlog';">
                                                <option value="">HEAD</option>
                                        
                                        [% FOREACH branch_head IN Repository.heads %]
@@ -114,23 +176,48 @@
                                [% END %]
                        [%- END %]
                        
+                       
                        [%- 
-                               c.action.name
-                                       .replace("_"," ")
-                                       .replace("log", " log")
-                                       .replace("fancy","")
-                                       .replace("index","Repositories") 
-                                       FILTER ucfirst 
+                               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;
+                               IF actions_list.$action_name;
+                                       '<a href="#" id="actions_nav_link"><span>' _ action_name_ucfirst _ '</span></a>';
+                               ELSE;
+                                       action_name_ucfirst;
+                               END;
+                               
                        -%]
-                       
-       
-                       
+
                        </h1>
        
+                       [%- 
+                               IF actions_list.$action_name;
+                               '<ul id="actions_nav_list">';
+                                       FOREACH action IN actions_list;
+                                               action_output = action.key FILTER ucfirst;
+                                               NEXT IF action_output == action_name_ucfirst;   
+                                               action = action.key;
+                                               '<li><a href="' _ c.uri_for("/")  _ c.req.path.replace(action_name, action) _ '">' _ action_output _ '</a></li>';
+                                       END;                    
+                               '</ul>';
+                               END;
+                       -%]
+               
        </div>
 </div>
 
-
+       
 <div id="content_holder">
        <div id="content" class="sub_holder">
                <div id="content_inner">
@@ -168,7 +255,7 @@
        [% USE Dumper %]
        <pre>
        [% Repository.path %]
-       [%# Dumper.dump(c.req.arguments.0) %]
+       [%# Dumper.dump(c.req.path) %]
        </pre>
        
        </div>