Merge pull request #460 from noobaa/eran_alpha_updates

minor ui updates
noobaa · Aug 5, 2015 · fe869c9 · fe869c9
2 parents 1876665 + 71a8dfc
commit fe869c9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/deploy/NVA_build/deploy_base.sh b/src/deploy/NVA_build/deploy_base.sh
@@ -167,8 +167,8 @@ function general_settings {
 	chmod 4755 /etc/profile.d/first_install_diaglog.sh
 
 	#Fix login message
-	echo -e "Welcome to your \x1b[0;35;40mNooBaa\x1b[0m, host \n" > /etc/issue
-	echo -e "You can use \x1b[0;32;40mnoobaa/Passw0rd\x1b[0m login to configure IP,DNS,GW and Hostname" >>/etc/issu
+	echo -e "Welcome to your \x1b[0;35;40mNooBaa\x1b[0m server.\n" > /etc/issue
+	echo -e "You can use \x1b[0;32;40mnoobaa/Passw0rd\x1b[0m login to configure IP,DNS,GW and Hostname" >>/etc/issue
 }
 
 function setup_supervisors {

diff --git a/src/deploy/NVA_build/upgrade_wrapper.sh b/src/deploy/NVA_build/upgrade_wrapper.sh
@@ -121,8 +121,8 @@ function post_upgrade {
   fi
   echo "${AGENT_VERSION_VAR}" >> ${CORE_DIR}/.env
 
-  echo -e "Welcome to your \x1b[0;35;40mNooBaa\x1b[0m, host \n" > /etc/issue
-	echo -e "You can use \x1b[0;32;40mnoobaa/Passw0rd\x1b[0m login to configure IP,DNS,GW and Hostname" >>/etc/issu
+  echo -e "Welcome to your \x1b[0;35;40mNooBaa\x1b[0m server,\n" > /etc/issue
+  echo -e "You can use \x1b[0;32;40mnoobaa/Passw0rd\x1b[0m login to configure IP,DNS,GW and Hostname" >>/etc/issue
 
   #NooBaa supervisor services configuration changes
   sed -i 's:logfile=.*:logfile=/tmp/supervisor/supervisord.log:' /etc/supervisord.conf

diff --git a/src/ngview/console/account_create_dialog.html b/src/ngview/console/account_create_dialog.html
@@ -15,10 +15,10 @@ <h3 class="modal-title">Create Account</h3>
                         <input type="password" name="password_fake" id="password_fake" value="" style="display:none;" />
                     <!-- end of fake fields -->
                     <div ng-if="nbClient.account.is_support||register" class="form-control-wrapper" style="margin: 40px 0">
-                        <input class="form-control floating-label" type="text" id="input_name" placeholder="NAME" required ng-model="$parent.system_name" ng-change="update_email_message();" ng-disabled="form_disabled"/>
+                        <input class="form-control floating-label" type="text" id="input_name" placeholder="NAME" autofocus="nbClient.account.is_support||register" required ng-model="$parent.system_name" ng-change="update_email_message();" ng-disabled="form_disabled"/>
                     </div>
                     <div class="form-control-wrapper" style="margin: 40px 0">
-                        <input class="form-control floating-label"  autocomplete="off" type="email" id="input_email" placeholder="EMAIL" required ng-model="email" autofocus ng-change="update_email_message();" ng-disabled="form_disabled" />
+                        <input class="form-control floating-label"  autocomplete="off" type="email" id="input_email" placeholder="EMAIL" required ng-model="email"  autofocus="!(nbClient.account.is_support||register)" ng-change="update_email_message();" ng-disabled="form_disabled" />
                     </div>
 
                     <div class="form-control-wrapper" style="margin: 40px 0">

diff --git a/src/server/web_server.js b/src/server/web_server.js
@@ -266,7 +266,7 @@ app.post('/upgrade', function(req, res) {
             stdio: ['ignore', stdout, stderr],
             cwd: '/tmp'
         });
-        res.end('<html><head><meta http-equiv="refresh" content="15;url=/console/" /></head>Upgrading. You will be redirected back to the upgraded site in 15 seconds.');
+        res.end('<html><head><meta http-equiv="refresh" content="60;url=/console/" /></head>Upgrading. You will be redirected back to the upgraded site in 60 seconds.');
     }
 });
 

diff --git a/src/views/console.html b/src/views/console.html
@@ -261,7 +261,7 @@ <h4>No activity</h4>
                 <a class="btn btn-default Xbtn-flat" style="padding: 25px 20px; margin: 0" ng-if="nav.reload_view" nb-click-ladda="nav.reload_view()">
                     <i rel="tooltip" title="Refresh" class="fa fa-repeat fa-2x text-muted"></i>
                 </a>
-                <a class="btn btn-default Xbtn-flat" style="padding: 25px 20px; margin: 0" ng-href="/console/users">
+                <a ng-if="nbSystem.system" class="btn btn-default Xbtn-flat" style="padding: 25px 20px; margin: 0" ng-href="/console/users">
                     <i rel="tooltip" title="User Management" class="fa fa-user fa-2x text-muted"></i>
                 </a>
                 <a class="btn btn-default Xbtn-flat navbar-toggle toggle-left" data-toggle="sidebar" data-target=".sidebar-right" style="padding: 25px 20px; margin: 0">