combine login and create-account page #15

OhadR · Jul 7, 2014 · bff4f12 · bff4f12
1 parent 96d7608
commit bff4f12
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 23 deletions.
diff --git a/cft_calc/src/main/webapp/app/authentication/login.html b/cft_calc/src/main/webapp/app/authentication/login.html
@@ -3,11 +3,9 @@
         <form ng-submit="vm.loginUser()">
             <h1>Login to the application</h1>
             <p class="row">
-                <label for="login">Email:</label>
                 <input type="email" name="login" ng-model="vm.userInfo.userName" placeholder="Enter you Email address" required>
             </p>
             <p class="row">
-                <label for="password">Password:</label>
                 <input type="password" name="password" ng-model="vm.userInfo.password" placeholder="Enter your Password" required>
             </p>
             <p class="login-submit pull-right">
@@ -20,27 +18,23 @@ <h1>Login to the application</h1>
     </div>
 </section>
 <section data-ng-controller="newuser as vm">
-    <div class="login new-user">
+    <div class="login">
         <form ng-submit="vm.createUser()">
             <h1>{{vm.title}}</h1>
             <p class="row">
-                <label for="login">Email:</label>
-                <input type="email" name="login" ng-model="vm.userInfo.userName" placeholder="Enter your email address" required>
+                <input type="email" name="login" ng-model="vm.userInfo.userName" placeholder="Your email" required>
             </p>
             <p class="row">
-                <label for="password">Password:</label>
-                <input type="password" name="password" ng-model="vm.userInfo.password" placeholder="Enter your password" required>
+                <input type="password" name="password" ng-model="vm.userInfo.password" placeholder="Create a password" required>
             </p>
             <p class="row">
-                <label for="firstname">First Name:</label>
-                <input type="text" name="firstname" ng-model="vm.userInfo.firstName" placeholder="Enter your first name" required>
+                <input type="text" name="firstname" ng-model="vm.userInfo.firstName" placeholder="Your first name" required>
             </p>
             <p class="row">
-                <label for="lastname">Last Name:</label>
-                <input type="text" name="lastname" ng-model="vm.userInfo.lastName" placeholder="Enter your last name" required>
+                <input type="text" name="lastname" ng-model="vm.userInfo.lastName" placeholder="Your last name" required>
             </p>
-            <p class="login-submit pull-right">
-                <button type="submit" class="login-button"></button>
+            <p class="row">
+                <button class="button primary button-block" type="submit">Sign up for benchmarkr</button>
             </p>
         </form>
     </div>

diff --git a/cft_calc/src/main/webapp/app/authentication/newuser.js b/cft_calc/src/main/webapp/app/authentication/newuser.js
@@ -9,7 +9,7 @@
         var log_error = getLogFn(controllerId, 'error');
 
         var vm = this;
-        vm.title = 'Create new user';
+        vm.title = 'Sign Up';
         vm.failedCreatingUser = false;
         vm.userInfo = {
             userName: '',

diff --git a/cft_calc/src/main/webapp/content/ohad.css b/cft_calc/src/main/webapp/content/ohad.css
@@ -0,0 +1,24 @@
+//<button class="button primary button-block" type="submit">DDD</...>
+
+.form-signup-home .button {
+border: 0;
+padding-top: 11px;
+padding-bottom: 11px;
+}
+
+.form-signup-home .button, .form-signup-home dl.form input[type="text"], .form-signup-home dl.form input[type="password"] {
+padding: 10px;
+font-size: 16px;
+border-radius: 5px;
+}
+
+.button.primary, .minibutton.primary {
+color: #fff;
+text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+background-color: #60b044;
+background-image: -moz-linear-gradient(#8add6d, #60b044);
+background-image: -webkit-linear-gradient(#8add6d, #60b044);
+background-image: linear-gradient(#8add6d, #60b044);
+background-repeat: repeat-x;
+border-color: #5ca941;
+}
diff --git a/cft_calc/src/main/webapp/content/styles.css b/cft_calc/src/main/webapp/content/styles.css
@@ -576,10 +576,6 @@ body, .login-submit, .login-submit:before, .login-submit:after {
   margin: 0 0 10px;
 }
 
-.new-user {
-    width: 600px !important;    
-}
-
 .login input, button, label {
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-size: 15px;
@@ -589,7 +585,7 @@ body, .login-submit, .login-submit:before, .login-submit:after {
   box-sizing: border-box;
 }
 
-.login input[type=text], input[type=email], input[type=password] {
+.login input[type=text], input[type=email], input[type=password], button {
   padding: 0 10px;
   width: 279px;
   height: 40px;
@@ -618,10 +614,6 @@ body, .login-submit, .login-submit:before, .login-submit:after {
   letter-spacing: 1px;
 }
 
-.new-user label {
-  width: 120px !important;
-}
-
 .forgot-password {
   padding-left: 100px;
   font-size: 13px;

diff --git a/cft_calc/src/main/webapp/index.html b/cft_calc/src/main/webapp/index.html
@@ -30,6 +30,7 @@
     <link href="content/toastr.css" rel="stylesheet" />
     <link href="content/customtheme.css" rel="stylesheet">
     <link href="content/styles.css" rel="stylesheet" />
+    <link href="content/ohad.css" rel="stylesheet" />
 </head>
 <body>
     <div>