Merge branch 'master' into cas

public/javascripts/admin/tutorial.js

@@ -480,25 +480,33 @@ $(document).ready(function(){
       buttons: [{name: "Quit", onclick: guiders.hideAll},
                 {name: "Next"}],
       id: "settingseditwelcome",
-      next: "editsubdomain",
+      next: (function(){
+        if($('#site_subdomain').length > 0){
+          return "editsubdomain";
+        }else{
+          return "settingssave";
+        }
+      }()),
       overlay: true,
       title: "The Settings Page"
     });
 
-    guiders.createGuider({
+    if($('#site_subdomain').length > 0){
-      attachTo: "#site_subdomain",
+      guiders.createGuider({
-      description: "Edit this field to change the subdomain of your site",
+        attachTo: "#site_subdomain",
-      buttons: [],
+        description: "Edit this field to change the subdomain of your site",
-      id: "editsubdomain",
+        buttons: [],
-      next: "settingssave",
+        id: "editsubdomain",
-      title: '',
+        next: "settingssave",
-      position: 12,
+        title: '',
-      onShow: function(){
+        position: 12,
-        $('#site_subdomain').bind('change', function(){
+        onShow: function(){
-          guiders.next();
+          $('#site_subdomain').bind('change', function(){
-        });
+            guiders.next();
-      }
+          });
-    });
+        }
+      });
+    }
 
     guiders.createGuider({
       buttons: [],