Ticket #103: 103 patch.diffs

Index: plugins/CoreHome/templates/url_anchor.js
===================================================================
--- plugins/CoreHome/templates/url_anchor.js    (revision 0)
+++ plugins/CoreHome/templates/url_anchor.js    (revision 0)
@@ -0,0 +1,83 @@
+/*
+  this class will be created by the menu.js file in document.ready();
+ */
+
+function url_anchor(){
+
+    /*
+     * Bind any url click that we want to use the anchor here:
+     */ 
+
+    // handle period click
+    $("#otherPeriods a").bind('click',this.handleAllLinkClick);
+
+    // sites selection link will be bind within the sites_selection.tpl,
+    // because by the time this get call the sites_selection dom is not ready.
+
+    return this;
+b}
+
+url_anchor.prototype = 
+{
+
+    updateAnchor : function(li_id,urlAjax)
+    {
+        var module = this.getParamValueFromUrl(urlAjax,"module");
+        var action = this.getParamValueFromUrl(urlAjax,"action");
+        var anchor = "#module=" + module + "&" + "action=" + action;
+        
+        //we don't want the current anchor on the url address
+        var location_href = window.location.href.substring(0,window.location.href.indexOf("#"));
+        //set the anchor
+        url_anchor.getAnchor = anchor;
+        window.location = location_href + anchor;
+    },
+
+    isAnchorExists : function()
+    {
+        var currentUrl = window.location.href;
+        //if currentURL have a #sign we assuming it is an anchor and return the rest of the string
+        var pattern = /#/;
+        if(currentUrl.match(pattern))
+        {
+                return currentUrl.substring(currentUrl.indexOf("#"),currentUrl.length);
+        }
+        else
+        {
+                return undefined;
+        }
+    },
+    
+    /*
+     * help to get param value for any given url string and param name
+     * don't pass in url with any anchor#.
+     # if you want to look for anchor param, just pass in the string after the # sign.
+     */
+    getParamValueFromUrl : function (url,param)
+    {
+        if((startStr = url.indexOf(param)) >= 0)
+        {
+            var endStr = url.indexOf("&", startStr);
+            if(endStr == -1)
+            {
+                    endStr = url.length;
+            }
+            return url.substring(startStr + param.length +1,endStr);
+        }
+        else
+        { 
+            return undefined; 
+        }
+    },
+    
+    /*
+     *  Append the anchor to url before proceed to new url
+     */
+    handleAllLinkClick : function (e){
+        e.preventDefault();
+
+        var currLink_anchor = $(e.target).attr("href") + url_anchor.getAnchor;
+        
+        window.location.href = currLink_anchor;
+    }
+};

Index: plugins/CoreHome/templates/menu.js
===================================================================
--- plugins/CoreHome/templates/menu.js  (revision 971)
+++ plugins/CoreHome/templates/menu.js  (working copy)
@@ -71,7 +71,13 @@
                        data: new Object
                };
                $.ajax(ajaxRequest);
-       
+
+                /*
+                 * setup anchor and add to the address
+                 */
+                var li_id = $(this).attr("id");
+                piwikUrlAnchor.updateAnchor(li_id,urlAjax);
+                
                return false;
                
        },
@@ -93,20 +99,51 @@
                        .find("li:has(ul)")
                        .hover(self.overMainLI, self.outMainLI)
                        ;
+                // add support for anchor in url.
+                // for all sub menu we want to have a unique id based on their module and action
+                this.param.superfish.find('li').each(function(){
+                        var url = $(this).find('a').attr('name');
+                        var module = piwikUrlAnchor.getParamValueFromUrl(url,"module");
+                        var action = piwikUrlAnchor.getParamValueFromUrl(url,"action");
+                        //don't add id if it is a main menu, anchor doesn't care about main menu at this point
+                        var main_menu = ($(this).parent().attr("class").match(/nav/)) ? true : undefined;
+                        if(!main_menu){
+                            $(this).attr({ id: module +'_'+action});
+                        }
+                    });
        },
        
        loadFirstSection: function()
        {
-               var self=this;
-               $('li:first', self.param.superfish)
-                       .click()
-                       .each(function(){
-                               $(this).showSuperfishUl(); 
-               });
+            var self=this;
+            
+            //if anchor exist click on the right menu.
+            if(anchor = piwikUrlAnchor.isAnchorExists()) 
+            {
+                var anchor_module = piwikUrlAnchor.getParamValueFromUrl(anchor,"module");
+                var anchor_action = piwikUrlAnchor.getParamValueFromUrl(anchor,"action");
+                var li_id = anchor_module + '_' + anchor_action;
+
+                $("#"+li_id).click();
+                $("#"+li_id).each( function(){
+                        $(this).parents().showSuperfishUl(); 
+                    });
+            }
+            else //Default
+            {
+                $('li:first', self.param.superfish)
+                .click()
+                .each(function(){
+                        $(this).showSuperfishUl(); 
+                    });
+            }
        }
-}
+};
 
 $(document).ready( function(){
+        //create the url_anchor obj to be use when user click on a module
+        piwikUrlAnchor = new url_anchor();
+
        piwikMenu = new menu();
        piwikMenu.init();
        piwikMenu.loadFirstSection();
Index: plugins/CoreHome/templates/calendar.js
===================================================================
--- plugins/CoreHome/templates/calendar.js      (revision 971)
+++ plugins/CoreHome/templates/calendar.js      (working copy)
@@ -101,8 +101,16 @@
        var currentUrl = window.location.href;
        if((startStrDate = currentUrl.indexOf("date")) >= 0)
        {
-               // look for the & after the date
-               var endStrDate = currentUrl.indexOf("&", startStrDate);
+               // look for the # after the date or & after date
+                // We need to know if anchorIndex exist;
+                var anchorIndex = currentUrl.match(/#/) ? currentUrl.indexOf("#", startStrDate) : undefined;
+                var endStrDate = currentUrl.indexOf("&", startStrDate);
+
+                // if endStrDate is higher than anchorIndex use anchor Index
+                if(anchorIndex && (endStrDate > anchorIndex)){
+                    endStrDate = anchorIndex;
+                }
+
                if(endStrDate == -1)
                {
                        endStrDate = currentUrl.length;
Index: plugins/CoreHome/templates/sites_selection.tpl
===================================================================
--- plugins/CoreHome/templates/sites_selection.tpl      (revision 971)
+++ plugins/CoreHome/templates/sites_selection.tpl      (working copy)
@@ -24,6 +24,9 @@
                var widthSitesSelection = $("#selectedSiteName").width() + 4 + extraPadding;
                $("#sitesSelectionWrapper").css('padding-right', widthSitesSelection);
                $("#sitesSelection").fdd2div({CssClassName:"formDiv"});
+                
+                // this will put the anchor after the url before proceed to different site.
+                $("#sitesSelection ul li").bind('click',piwikUrlAnchor.handleAllLinkClick);
        });</script>
        {/literal}
 </span>

Index: plugins/CoreHome/templates/js_css_includes.tpl
===================================================================
--- plugins/CoreHome/templates/js_css_includes.tpl      (revision 971)
+++ plugins/CoreHome/templates/js_css_includes.tpl      (working copy)
@@ -17,6 +17,7 @@
 <script type="text/javascript" src="plugins/CoreHome/templates/menu.js"></script>
 <script type="text/javascript" src="libs/jquery/thickbox.js"></script>
 <link rel="stylesheet" type="text/css" href="libs/jquery/thickbox.css" />
+<script type="text/javascript" src="plugins/CoreHome/templates/url_anchor.js"></script>
 
 <link rel="stylesheet" type="text/css" href="themes/default/common.css" />
 <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/styles.css" />