Skip to content

Commit

Permalink
Add placeholders
Browse files Browse the repository at this point in the history
- add placeholder for login, registration and invite forms
- change size of 'Remove' user from team button
- refactor invite form
- add ':' to Logout
  • Loading branch information
Alexey Panashchenko committed Mar 23, 2015
1 parent 7d4d75e commit 594edef
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion anarchoAppFront/app/scripts/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

app.constant('app_config', {
API_URL: 'api/'
API_URL: 'http://localhost:5000/api/'
});
4 changes: 2 additions & 2 deletions anarchoAppFront/app/views/auth_login_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
ng-submit="login(credentials)" novalidate>
<div class="form-group">
<label for="email">Email:</label>
<input class="form-control" type="text" id="email"
<input class="form-control" type="text" id="email" placeholder="Enter email"
ng-model="credentials.email"></div>
<div class="form-group">
<label for="password">Password:</label>
<input class="form-control" type="password" id="password"
<input class="form-control" type="password" id="password" placeholder="Enter password"
ng-model="credentials.password">
</div>
<button class="btn btn-default" type="submit">Login</button>
Expand Down
6 changes: 3 additions & 3 deletions anarchoAppFront/app/views/auth_reg_form.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<form name="regForm" ng-submit="register(regData)" novalidate>
<div class="form-group">
<label for="name">Name:</label>
<input class="form-control" type="text" id="name"
<input class="form-control" type="text" id="name" placeholder="Enter name"
ng-model="regData.name"></div>
<div class="form-group">
<label for="name">Email:</label>
<input class="form-control" type="email" id="email"
<input class="form-control" type="email" id="email" placeholder="Enter email"
ng-model="regData.email" required></div>
<div class="form-group">
<label for="password">Password:</label>
<input class="form-control" type="password" id="password"
<input class="form-control" type="password" id="password" placeholder="Enter password"
ng-model="regData.password">
</div>
<button class="btn btn-default" type="submit">Register</button>
Expand Down
2 changes: 1 addition & 1 deletion anarchoAppFront/app/views/nav_bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<ul class="nav navbar-nav navbar-right">
<li class="nav-divider"></li>
<li><a href="#" ng-controller="AuthCtrl" ng-click='logout()'>Logout
<li><a href="#" ng-controller="AuthCtrl" ng-click='logout()'>Logout:
<b>{{ currentUser.name }}</b></a></li>
</ul>
</div>
Expand Down
12 changes: 6 additions & 6 deletions anarchoAppFront/app/views/settings_team.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div ng-controller="AppTeamCtrl" class="text-left">
<p>Team:</p>
<table class="table table-hover table-bordered">
<tr ng-repeat="u in permissions" vertical-align="middle">
<tr ng-repeat="u in permissions">
<td width="50%">
{{ u.username }}
</td>
Expand All @@ -18,7 +18,7 @@
</select>
</td>
<td ng-show="canWrite()">
<a class="btn btn-danger" ng-click="revokeUser(u)">Remove</a>
<a class="btn btn-danger btn-xs" ng-click="revokeUser(u)">Remove</a>
</td>
</tr>
</table>
Expand All @@ -35,10 +35,10 @@
<p ng-switch-when="invalid_email_length">Is User real has so long email!?<br>How does He remember it?</p>

</div>
<form name="addUserForm" ng-show="canWrite()" ng-submit="addUser(user_app)" novalidate>
<div class="form-inline text-right" ng-init="user_app.app_key=app.app_key;user_app.permission='r'">
<label>Invite user to {{app.name}}: </label>
<input class="form-control" type="text" id="username"
<form class="form-inline pull-right" name="addUserForm" ng-show="canWrite()" ng-submit="addUser(user_app)" novalidate>
<div class="form-group text-right" ng-init="user_app.app_key=app.app_key;user_app.permission='r'">
<label for="username">Invite user to {{app.name}}: </label>
<input id="username" class="form-control" type="text" placeholder="Enter email"
ng-model="user_app.email">
<button class="btn btn-default" type="submit">Invite</button>
</div>
Expand Down

0 comments on commit 594edef

Please sign in to comment.