Merge branch 'keithmaster'

www/aptui/js/main.js

@@ -3,18 +3,19 @@ require.config({
     paths: {
 	'jquery': 'js/lib/jquery-2.0.3.min',
 	'bootstrap': 'bootstrap/js/bootstrap',
+	'formhelpers': 'formhelpers/js/bootstrap-formhelpers',
 	'dateformat': 'js/lib/date.format',
 	'd3': 'js/lib/d3.v3',
     },
     shim: {
 	'bootstrap': { deps: ['jquery'] },
+	'formhelpers': { deps: ['bootstrap']},
 	'dateformat': { exports: 'dateFormat' },
 	'd3': { exports: 'd3' }
     },
 });
 
 require(['jquery', 'js/quickvm_sup',
-	 'formhelpers/js/bootstrap-formhelpers',
 	 // jQuery modules
 	 'bootstrap'],
 function ($, sup)
@@ -87,7 +88,7 @@ function ($, sup)
 
     function initIndex()
     {
-        sup.UpdateProfileSelection($('#profile_name li:eq(0)'));
+        sup.UpdateProfileSelection($('#profile_name li[value = ' + window.PROFILE + ']'));
         $('#quickvm_topomodal').on('hidden.bs.modal', function() {
             sup.ShowProfileList($('.current'))
         });

www/aptui/quickvm.php

@@ -272,14 +272,24 @@ function SPITFORM($username, $email, $sshkey, $profile, $newuser, $errors)
             </div>
           </div>
        </div>\n";
-    echo "<script type='text/javascript'>\n";
-    echo "window.APT_OPTIONS = {\n";
-    echo "  pageType: 'index',\n";
-    if ($newuser) {
-        echo "  isNewUser: true\n";
-    }
-    echo "};\n";
-    echo "</script>\n";
+
+      echo "<script type='text/javascript'>\n";
+      if (isset($profile) && $profile != "") {
+        echo "window.PROFILE = '$profile_value';\n";
+      }
+      else {
+        echo "window.PROFILE = '$profile_default';\n";
+      }
+      echo "</script>\n";
+      echo "<script type='text/javascript'>\n";
+
+      echo "window.APT_OPTIONS = {\n";
+      echo "  pageType: 'index',\n";
+      if ($newuser) {
+          echo "  isNewUser: true\n";
+      }
+      echo "};\n";
+      echo "</script>\n";
 }
 
 if (!isset($create)) {