Fixes #10 Fixes #7 Fixes #5 Fixes #3

octobercms · Apr 17, 2014 · b3d5d47 · b3d5d47 · raftelco · Apr 17, 2014
1 parent 58359b7
commit b3d5d47
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 33 deletions.
diff --git a/.htaccess b/.htaccess
diff --git a/install_files/js/app.js b/install_files/js/app.js
@@ -58,10 +58,17 @@ Installer.showPage = function(pageId, noPush) {
     $('#containerFooter').renderPartial('footer', page)
 
     /*
-     * @todo Cache the body load instead of resetting it on a secondary load 
+     * Check if the content container exists already, if not, create it
      */
-    $('#containerBody').renderPartial(page.body, page)
-    page.init && page.init()
+    var pageContainer = $('#containerBody').find('.pageContainer-' + pageId);
+    if (!pageContainer.length) {
+        pageContainer = $('<div />').addClass('pageContainer-' + pageId);
+        pageContainer.renderPartial(page.body, page)
+        $('#containerBody').append(pageContainer);
+        page.init && page.init()
+    }
+
+    pageContainer.show().siblings().hide();
 
     // New page, add it to the history
     if (history.pushState && !noPush) {
@@ -278,8 +285,12 @@ $.extend({
 })
 
 window.onpopstate = function(event) {
+    // If progress page has rendered, disable navigation
+    if (Installer.Pages.installProgress.isRendered) {
+        // Do nothing
+    }
     // Navigate back/foward through a known push state
-    if (event.state) {
+    else if (event.state) {
         // Only allow navigation to previously rendered pages
         var noPop = (!Installer.Pages[event.state.page].isRendered || Installer.ActivePage == event.state.page)
         if (!noPop)

diff --git a/install_files/js/complete.js b/install_files/js/complete.js
@@ -9,8 +9,14 @@ Installer.Pages.installComplete.beforeUnload = function() {
 
 Installer.Pages.installComplete.beforeShow = function() {
 
+    var backendUri = Installer.Data.config.backend_uri,
+        baseUrl = installerBaseUrl
+
+        if (baseUrl.charAt(baseUrl.length - 1) == '/')
+            baseUrl = baseUrl.substr(0, baseUrl.length - 1)
+
     Installer.Pages.installComplete.baseUrl = installerBaseUrl
-    Installer.Pages.installComplete.backendUrl = installerBaseUrl + 'backend';
+    Installer.Pages.installComplete.backendUrl = baseUrl + backendUri
 
 }
 

diff --git a/install_files/js/config.js b/install_files/js/config.js
@@ -13,6 +13,9 @@ Installer.Pages.configForm.init = function() {
         configFormDatabase = $('#configFormDatabase')
 
     configFormDatabase.renderPartial('config/mysql')
+
+    // Set the encryption code with a random string
+    $('#advEncryptionCode').val(Math.random().toString(36).slice(2))
 }
 
 Installer.Pages.configForm.next = function() {
@@ -41,7 +44,7 @@ Installer.Pages.configForm.next = function() {
 
                 // Scroll browser to the bottom of the error
                 var scrollTo = configFormFailed.offset().top - $(window).height() + configFormFailed.height() + 10
-                $('body,html').animate({ scrollTop: scrollTo })
+                $('body, html').animate({ scrollTop: scrollTo })
             })
         })
     })

diff --git a/install_files/partials/config/admin.htm b/install_files/partials/config/admin.htm
@@ -1,9 +1,10 @@
 <p class="lead">Please specify details for logging in to the Administration Area.</p>
 
 <div class="form-group">
-    <label for="admin_first_name" class="control-label col-sm-4">First Name</label>
+    <label for="adminFirstName" class="control-label col-sm-4">First Name</label>
     <div class="col-sm-8">
         <input
+            id="adminFirstName"
             name="admin_first_name"
             class="form-control"
             value="Admin"
@@ -12,9 +13,10 @@
 </div>
 
 <div class="form-group">
-    <label for="admin_last_name" class="control-label col-sm-4">Last Name</label>
+    <label for="adminLastName" class="control-label col-sm-4">Last Name</label>
     <div class="col-sm-8">
         <input
+            id="adminLastName"
             name="admin_last_name"
             class="form-control"
             value="Person"
@@ -23,9 +25,10 @@
 </div>
 
 <div class="form-group">
-    <label for="admin_email" class="control-label col-sm-4">Email Address</label>
+    <label for="adminEmail" class="control-label col-sm-4">Email Address</label>
     <div class="col-sm-8">
         <input
+            id="adminEmail"
             name="admin_email"
             class="form-control"
             value="admin@admin.admin"
@@ -34,9 +37,10 @@
 </div>
 
 <div class="form-group">
-    <label for="admin_login" class="control-label col-sm-4">Admin Login</label>
+    <label for="adminLogin" class="control-label col-sm-4">Admin Login</label>
     <div class="col-sm-8">
         <input
+            id="adminLogin"
             name="admin_login"
             class="form-control"
             value="admin"
@@ -45,12 +49,13 @@
 </div>
 
 <div class="form-group">
-    <label for="admin_password" class="control-label col-sm-4">Admin Password</label>
+    <label for="adminPassword" class="control-label col-sm-4">Admin Password</label>
     <div class="col-sm-8">
         <input
+            id=="adminPassword"
             name="admin_password"
             class="form-control"
-            value="admin"
+            value=""
             />
     </div>
 </div>
diff --git a/install_files/partials/config/advanced.htm b/install_files/partials/config/advanced.htm
@@ -3,9 +3,10 @@
 </p>
 
 <div class="form-group">
-    <label for="backend_uri" class="control-label col-sm-4">Backend URL</label>
+    <label for="advBackendUri" class="control-label col-sm-4">Backend URL</label>
     <div class="col-sm-8">
         <input
+            id="advBackendUri"
             name="backend_uri"
             class="form-control"
             value="/backend" />
@@ -17,9 +18,10 @@
     Specify a unique code for protecting sensitive data, such as user passwords.
 </p>
 <div class="form-group">
-    <label for="encryption_code" class="control-label col-sm-4">Encryption Code</label>
+    <label for="advEncryptionCode" class="control-label col-sm-4">Encryption Code</label>
     <div class="col-sm-8">
         <input
+            id="advEncryptionCode"
             name="encryption_code"
             class="form-control"
             value="RANDOM_STRING" />
@@ -32,19 +34,21 @@
 </p>
 
 <div class="form-group">
-    <label for="folder_mask" class="control-label col-sm-4">File Permission Mask</label>
+    <label for="advFolderMask" class="control-label col-sm-4">File Permission Mask</label>
     <div class="col-sm-8">
         <input
+            id="advFolderMask"
             name="folder_mask"
             class="form-control"
             value="777" />
     </div>
 </div>
 
 <div class="form-group">
-    <label for="file_mask" class="control-label col-sm-4">Folder Permission Mask</label>
+    <label for="advFileMask" class="control-label col-sm-4">Folder Permission Mask</label>
     <div class="col-sm-8">
         <input
+            id="advFileMask"
             name="file_mask"
             class="form-control"
             value="777" />

diff --git a/install_files/partials/config/database.htm b/install_files/partials/config/database.htm
@@ -4,9 +4,9 @@
     <label for="dbType" class="control-label col-sm-4">Database Type</label>
     <div class="col-sm-8">
         <select
+            id="dbType"
             name="db_type"
             class="form-control"
-            id="dbType"
             onchange="Installer.Pages.configForm.toggleDatabase(this)">
             <option value="mysql">MySQL</option>
             <option value="pgsql">Postgres</option>

diff --git a/install_files/partials/config/mysql.htm b/install_files/partials/config/mysql.htm
@@ -2,10 +2,10 @@
     <label for="dbHost" class="control-label col-sm-4">MySQL Host</label>
     <div class="col-sm-8">
         <input
+            id="dbHost"
             name="db_host"
             class="form-control"
             value="localhost"
-            id="dbHost"
             />
         <span class="help-block">Specify the hostname for the database connection.</span>
     </div>
@@ -15,10 +15,10 @@
     <label for="dbName" class="control-label col-sm-4">Database Name</label>
     <div class="col-sm-8">
         <input
+            id="dbName"
             name="db_name"
             class="form-control"
             value=""
-            id="dbName"
             />
         <span class="help-block">Specify the name of the empty database.</span>
     </div>
@@ -28,10 +28,10 @@
     <label for="dbUser" class="control-label col-sm-4">MySQL Login</label>
     <div class="col-sm-8">
         <input
+            id="dbUser"
             name="db_user"
             class="form-control"
             value=""
-            id="dbUser"
             />
         <span class="help-block">User with all privileges in the database.</span>
     </div>
@@ -41,10 +41,10 @@
     <label for="dbPass" class="control-label col-sm-4">MySQL Password</label>
     <div class="col-sm-8">
         <input
+            id="dbPass"
             name="db_pass"
             class="form-control"
             value=""
-            id="dbPass"
             />
         <span class="help-block">Password for the specified user.</span>
     </div>

diff --git a/install_files/partials/config/pgsql.htm b/install_files/partials/config/pgsql.htm
@@ -2,10 +2,10 @@
     <label for="dbHost" class="control-label col-sm-4">Postgres Host</label>
     <div class="col-sm-8">
         <input
+            id="dbHost"
             name="db_host"
             class="form-control"
             value="localhost"
-            id="dbHost"
             />
             <span class="help-block">Specify the hostname for the database connection.</span>
     </div>
@@ -15,10 +15,10 @@
     <label for="dbName" class="control-label col-sm-4">Database Name</label>
     <div class="col-sm-8">
         <input
+            id="dbName"
             name="db_name"
             class="form-control"
             value=""
-            id="dbName"
             />
             <span class="help-block">Specify the name of the empty database.</span>
     </div>
@@ -28,10 +28,10 @@
     <label for="dbUser" class="control-label col-sm-4">Postgres Login</label>
     <div class="col-sm-8">
         <input
+            id="dbUser"
             name="db_user"
             class="form-control"
             value=""
-            id="dbUser"
             />
             <span class="help-block">User with all privileges in the database.</span>
     </div>
@@ -41,10 +41,10 @@
     <label for="dbPass" class="control-label col-sm-4">Postgres Password</label>
     <div class="col-sm-8">
         <input
+            id="dbPass"
             name="db_pass"
             class="form-control"
             value=""
-            id="dbPass"
             />
             <span class="help-block">Password for the specified user.</span>
     </div>

diff --git a/install_files/partials/config/sqlite.htm b/install_files/partials/config/sqlite.htm
@@ -2,10 +2,10 @@
     <label for="dbName" class="control-label col-sm-4">SQLite Database Path</label>
     <div class="col-sm-8">
         <input
+            id="dbName"
             name="db_name"
             class="form-control"
             value="../database/production.sqlite"
-            id="dbName"
             />
         <span class="help-block">Specify absolute path to the SQLite database file.</span>
     </div>

diff --git a/install_files/partials/config/sqlsrv.htm b/install_files/partials/config/sqlsrv.htm
@@ -2,10 +2,10 @@
     <label for="dbHost" class="control-label col-sm-4">SQL Host</label>
     <div class="col-sm-8">
         <input
+            id="dbHost"
             name="db_host"
             class="form-control"
             value="localhost"
-            id="dbHost"
             />
         <span class="help-block">Specify the hostname for the database connection.</span>
     </div>
@@ -15,10 +15,10 @@
     <label for="dbName" class="control-label col-sm-4">Database Name</label>
     <div class="col-sm-8">
         <input
+            id="dbName"
             name="db_name"
             class="form-control"
             value=""
-            id="dbName"
             />
         <span class="help-block">Specify the name of the empty database.</span>
     </div>
@@ -28,10 +28,10 @@
     <label for="dbUser" class="control-label col-sm-4">SQL Login</label>
     <div class="col-sm-8">
         <input
+            id="dbUser"
             name="db_user"
             class="form-control"
             value=""
-            id="dbUser"
             />
             <span class="help-block">User with all privileges in the database.</span>
     </div>
@@ -41,10 +41,11 @@
     <label for="dbPass" class="control-label col-sm-4">SQL Password</label>
     <div class="col-sm-8">
         <input
+            id="dbPass"
             name="db_pass"
             class="form-control"
             value=""
-            id="dbPass"/>
+            />
         <span class="help-block">Password for the specified user.</span>
     </div>
 </div>