viithiisys / adminAcufuel

Download as
Browse Code ยป

Commit 976f0b4a875f28766e80eefb676f443c6140f6dd

Authored by Swarn Singh
1 parent e2bce8d019
Exists in master

astrick issue resolved

Showing 2 changed files with 18 additions and 8 deletions   Show diff stats
app/views/fbo-admin/dashboard.html
Diff comments   View file @976f0b4
... ... @@ -2,13 +2,17 @@
2 2 .customErrorMessage{
3 3 color: #8a1f11;
4 4 font-weight: bold;
5   - margin-left: 10px;
  5 +
6 6 }
7 7 .customErrorInput{
8 8 background-color: rgb(251, 227, 228);
9 9 border: 1px solid #fbc2c4;
10 10 color: #8a1f11;
11 11 }
  12 + .redAstrick{
  13 + color: #8a1f11;
  14 + margin: 0 1px;
  15 + }
12 16 </style>
13 17  
14 18 </div>
... ... @@ -17,6 +21,7 @@
17 21 <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
18 22 <div style="margin-top: 20px;">
19 23 <input type="text" style="width:50%; float: left;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control companyNameError" ng-keyup="companyNameValid()">
  24 + <span class="redAstrick" style="margin: 0 5px;">*</span>
20 25 <label class="customErrorMessage" ng-show="comnayNameInvalid" style="margin-top: 7px;">This field is required.</label>
21 26 <div class="clearfix"></div>
22 27 </div>
... ... @@ -54,7 +59,7 @@
54 59 <div class="col-sm-6 b-r">
55 60 <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
56 61 <div class="form-group">
57   - <label>Email Username</label>
  62 + <label>Email Username <span class="redAstrick">*</span></label>
58 63 <label class="customErrorMessage" ng-show="emailInvalid">This field is required.</label>
59 64 <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control emailIdError" ng-blur="checkUsername()" ng-keyup="emailValid()">
60 65 </div>
... ... @@ -74,7 +79,7 @@
74 79 </div>
75 80 <div class="col-sm-6">
76 81 <div class="form-group">
77   - <label>Password</label>
  82 + <label>Password <span class="redAstrick">*</span></label>
78 83 <label class="customErrorMessage" ng-show="passwordInvalid">This field is required.</label>
79 84 <input type="password" ng-model="user.password" placeholder="Password" class="form-control invalidPassword" ng-keyup="passwordValid()">
80 85 </div>
... ...
app/views/fbo-flight/flight.html
Diff comments   View file @976f0b4
... ... @@ -68,12 +68,15 @@
68 68 .customErrorMessage{
69 69 color: #8a1f11;
70 70 font-weight: bold;
71   - margin-left: 10px;
72 71 }
73 72 .customErrorInput{
74 73 background-color: rgb(251, 227, 228);
75 74 border: 1px solid #fbc2c4;
76   - color: #8a1f11;
  75 + color: #8a1f11;
  76 + }
  77 + .redAstrick{
  78 + color: #8a1f11;
  79 + margin: 0 1px;
77 80 }
78 81  
79 82 </style>
... ... @@ -81,8 +84,10 @@
81 84 <div class="col-lg-8">
82 85 <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
83 86 <div style="margin-top: 20px;">
84   - <input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control companyNameError" ng-keyup="companyNameValid()">
  87 + <input type="text" style="width:50%; float: left;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control companyNameError" ng-keyup="companyNameValid()">
  88 + <span class="redAstrick" style="margin: 0 5px;">*</span>
85 89 <label class="customErrorMessage" ng-show="comnayNameInvalid" style="margin-top: 7px;">This field is required.</label>
  90 + <div class="clearfix"></div>
86 91 </div>
87 92 </div>
88 93 <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
... ... @@ -117,7 +122,7 @@
117 122 <div class="col-sm-6 b-r">
118 123 <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
119 124 <div class="form-group">
120   - <label>Email Username</label>
  125 + <label>Email Username <span class="redAstrick">*</span></label>
121 126 <label class="customErrorMessage" ng-show="emailInvalid">This field is required.</label>
122 127 <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control emailIdError" ng-blur="checkUsername()" ng-keyup="emailValid()">
123 128 </div>
... ... @@ -131,7 +136,7 @@
131 136 </div>
132 137 <div class="col-sm-6">
133 138 <div class="form-group">
134   - <label>Password</label>
  139 + <label>Password <span class="redAstrick" style="margin: 0 5px;">*</span></label>
135 140 <label class="customErrorMessage" ng-show="passwordInvalid">This field is required.</label>
136 141 <input type="password" ng-model="user.password" placeholder="Password" class="form-control invalidPassword" ng-keyup="passwordValid()">
137 142 </div>
... ...