Merge branch 'master' into cas

public/javascripts/admin/tutorial.js

@@ -58,7 +58,6 @@ $(document).ready(function(){
       var possibles = ['ul.folder:first li',
                        'ul#pages-list li'];
       for(var i = 0; i<possibles.length; i++){
-        console.log("checking possibles", i, possibles[i]);
         if($(possibles[i]).length > 0){
           return possibles[i];
         }
@@ -97,7 +96,13 @@ $(document).ready(function(){
      });
      
      guiders.createGuider({
-      attachTo: 'li.hoverable:eq(2)',
+         attachTo: (function(){
+           if($('li.hoverable:eq(2)').length > 0){
+             return 'li.hoverable:eq(2)';
+           }else{
+             return 'li.hoverable:first';
+           }
+         }()),
          buttons: [{name: "Quit", onclick: guiders.hideAll},
                    {name: "Next - Edit an Event",
                                onclick: function(){
@@ -551,9 +556,9 @@ $(document).ready(function(){
   $(".tutorial").click(function(){
     var $this = $(this);
     guiders.hideAll();
-    if($this.attr('href') != '#'){
+    if($this.attr('href') != '#' && window.location.pathname != $this.attr('href')){
       window.location = $this.attr('href') + "#guider=" + $this.attr('id');
-      window.location.refresh;
+      window.location.reload();
     }else{
       guiders.show($this.attr('id'));
     }
@@ -583,6 +588,7 @@ $(document).ready(function(){
 
   window.onload = function(){
     window.setTimeout(function(){
+      if($('#bushi_banner').length > 0){
         guiders.createGuider({
           attachTo: "#bushi_banner",
           description: "You may have noticed the bar at the top of your site. Its provided by Bushido. Bushido are friends of LocomotiveCMS. They are our official hosting partner.\
@@ -594,6 +600,7 @@ $(document).ready(function(){
           next: "congratulations",
           position: 6
         });
+      }
     }, 1000);
   };