Skip to content

Commit

Permalink
Add fresh static into app. New version 0.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
nrudenko committed Mar 23, 2015
1 parent b3cb963 commit cd348e3
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion anarchoApp/anarcho/static/views/auth_login_form.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<form name="loginForm" ng-submit="login(credentials)" novalidate> <div class="form-group"> <label for="email">Email:</label> <input class="form-control" type="text" id="email" ng-model="credentials.email"></div> <div class="form-group"> <label for="password">Password:</label> <input class="form-control" type="password" id="password" ng-model="credentials.password"> </div> <button class="btn btn-default" type="submit">Login</button> </form>
<form name="loginForm" ng-submit="login(credentials)" novalidate> <div class="form-group"> <label for="email">Email:</label> <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" placeholder="Enter password" ng-model="credentials.password"> </div> <button class="btn btn-default" type="submit">Login</button> </form>
2 changes: 1 addition & 1 deletion anarchoApp/anarcho/static/views/auth_reg_form.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<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" ng-model="regData.name"></div> <div class="form-group"> <label for="name">Email:</label> <input class="form-control" type="email" id="email" ng-model="regData.email" required></div> <div class="form-group"> <label for="password">Password:</label> <input class="form-control" type="password" id="password" ng-model="regData.password"> </div> <button class="btn btn-default" type="submit">Register</button> </form>
<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" 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" 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" placeholder="Enter password" ng-model="regData.password"> </div> <button class="btn btn-default" type="submit">Register</button> </form>
2 changes: 1 addition & 1 deletion anarchoApp/anarcho/static/views/nav_bar.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<nav class="navbar navbar-default"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" ng-if="currentUser"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="#apps">anarcho</a> </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1" ng-if="currentUser"> <ul class="nav navbar-nav"> <li><a href="#apps">Apps</a></li> </ul> <ul class="nav navbar-nav navbar-right"> <li class="nav-divider"></li> <li><a href="#" ng-controller="AuthCtrl" ng-click="logout()">Logout <b>{{ currentUser.name }}</b></a></li> </ul> </div> </div> </nav>
<nav class="navbar navbar-default"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" ng-if="currentUser"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="#apps">anarcho</a> </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1" ng-if="currentUser"> <ul class="nav navbar-nav"> <li><a href="#apps">Apps</a></li> </ul> <ul class="nav navbar-nav navbar-right"> <li class="nav-divider"></li> <li><a href="#" ng-controller="AuthCtrl" ng-click="logout()">Logout: <b>{{ currentUser.name }}</b></a></li> </ul> </div> </div> </nav>
2 changes: 1 addition & 1 deletion anarchoApp/anarcho/static/views/settings_team.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<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"> <td width="50%"> {{ u.username }} <td width="50%"> {{ u.email}} <td> <select class="btn btn-info" ng-model="u.permission" ng-options="p.id as p.name for p in all_permissions" ng-change="updateUser(u)" ng-disabled="!canWrite()"> </select> <td ng-show="canWrite()"> <a class="btn btn-danger" ng-click="revokeUser(u)">Remove</a> </table> <div ng-switch="error" class="text-right text-danger"> <p ng-switch-when="user_with_current_email_already_exist">User with this email already registered!</p> <p ng-switch-when="invalid_email">Invalid email!</p> <p ng-switch-when="email_is_empty">Email is empty!</p> <p ng-switch-when="invalid_email_format">Invalid email format!</p> <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" ng-model="user_app.email"> <button class="btn btn-default" type="submit">Invite</button> </div> </form> </div>
<div ng-controller="AppTeamCtrl" class="text-left"> <p>Team:</p> <table class="table table-hover table-bordered"> <tr ng-repeat="u in permissions"> <td width="50%"> {{ u.username }} <td width="50%"> {{ u.email}} <td> <select class="btn btn-info" ng-model="u.permission" ng-options="p.id as p.name for p in all_permissions" ng-change="updateUser(u)" ng-disabled="!canWrite()"> </select> <td ng-show="canWrite()"> <a class="btn btn-danger btn-xs" ng-click="revokeUser(u)">Remove</a> </table> <div ng-switch="error" class="text-right text-danger"> <p ng-switch-when="user_with_current_email_already_exist">User with this email already registered!</p> <p ng-switch-when="invalid_email">Invalid email!</p> <p ng-switch-when="email_is_empty">Email is empty!</p> <p ng-switch-when="invalid_email_format">Invalid email format!</p> <p ng-switch-when="invalid_email_length">Is User real has so long email!?<br>How does He remember it?</p> </div> <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> </form> </div>
2 changes: 1 addition & 1 deletion anarchoApp/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name='anarcho',
version='0.5.2',
version='0.5.3',
url='https://github.com/nrudenko/anarcho',
license='MIT',
author='Nikolay Rudenko',
Expand Down
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: 'http://localhost:5000/api/'
API_URL: 'api/'
});

0 comments on commit cd348e3

Please sign in to comment.