This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit bf4d364dd5d24e3beb4292101a02af059e9d5b47 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 14 18:31:18 2014 +0100 prepare user ui --- .../src/main/webapp/views/users/newuser.html | 79 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/views/users/user.html | 26 +++++++ coselmar-ui/src/main/webapp/views/users/users.html | 41 +++++++++++ 3 files changed, 146 insertions(+) diff --git a/coselmar-ui/src/main/webapp/views/users/newuser.html b/coselmar-ui/src/main/webapp/views/users/newuser.html new file mode 100644 index 0000000..6a75c85 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/users/newuser.html @@ -0,0 +1,79 @@ +<div style="padding: 0px 0px 0px 30px"> + <div class="page-header" style="margin: 0"> + <h2>Add new user</h2> + </div> + + <div style="padding-top: 15px"> + Create new user, with one of following roles : + <ul> + <li>Supervisor : Kind of big manager, who relays member/client question and assigns expert on questions</li> + <li>Expert : Scientist, who can add new document in the repository and see other scientist documents (according file permission)</li> + <li>Member</li> + <li>Client</li> + </ul> + </div> + <div style="padding-bottom: 50px"> + + <div class=""> + + <form class="form-horizontal" role="form" ng-submit="createNewUser()"> + + <div class="form-group"> + <label class="col-md-4 control-label">FirstName</label> + + <div class="col-md-5"> + <input type="file" class="form-control" name="firstName" ng-model="user.firstName" required/> + </div> + </div> + + <div class="form-group"> + <label class="col-md-4 control-label">Name</label> + + <div class="col-md-5"> + <input type="text" class="form-control" name="name" ng-model="user.name" required/> + </div> + </div> + + <div class="form-group"> + <label class="col-md-4 control-label">Role</label> + + <div class="col-md-5"> + <select class="form-control" name="role" ng-model="user.role"> + <option value="supervisor">Supervisor</option> + <option value="expert">Expert</option> + <option value="member">Member</option> + <option value="client">Client</option> + </select> + </div> + + </div> + + <div class="form-group"> + <label class="col-md-4 control-label">Mail</label> + + <div class="col-md-5"> + <input type="text" class="form-control" name="mail" ng-model="user.mail" required/> + </div> + + </div> + + <div class="form-group"> + <label class="col-md-4 control-label">Qualification</label> + + <div class="col-md-5"> + <input type="text" class="form-control" name="qualification" ng-model="user.qualification" required/> + </div> + + </div> + + <div class="form-group"> + <div style="padding-left: 200px"> + <input type="submit" value="Submit" class="btn btn-primary" /> + </div> + </div> + </form> + </div> + + </div> + +</div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/users/user.html b/coselmar-ui/src/main/webapp/views/users/user.html new file mode 100644 index 0000000..3245cba --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/users/user.html @@ -0,0 +1,26 @@ +<div style="padding: 0px 0px 0px 30px"> + <div class="page-header" style="margin: 0"> + <h1> + {{user.firstName}} {{user.name}} + </h1> + </div> + <div> + <table class="table table-striped"> + <tr> + <td>Contact</td> + <td>{{user.mail}}</td> + </tr> + <tr> + <td>Qualification</td> + <td>{{user.qualification}}</td> + </tr> + <tr> + <td>Role</td> + <td>{{user.role}}</td> + </tr> + </table> + <div style="padding-left: 200px"> + <a class="btn btn-danger" ng-click="deleteUser(user.id)">Delete</a> + </div> + </div> +</div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html new file mode 100644 index 0000000..8f2c904 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -0,0 +1,41 @@ +<div style="padding: 0px 0px 0px 30px"> + <div class="page-header" style="margin: 0"> + <h1> + <!-- Heading goes here --> + All Users + </h1> + </div> + + <div> + <div> + <div class="form-group"> + <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add an user</a> + </div> + <form class="form-inline pull-right" role="userOptions" ng-submit="searchUser()"> + <div class="form-group"> + <input type="search" class="form-control" placeholder="Search an user" ng-model="searchKeywords" ng-list /> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> + </div> + </form> + </div> + <br/> + <table class="table"> + <tr> + <th>Name</th> + <th>Mail</th> + <th>Qualification</th> + <th>Role</th> + <th></th> + </tr> + <tr ng-repeat="user in users"> + <td><a href="#/user/{{user.id}}">{{user.firstname}} {{user.name}}</a></td> + <td>{{user.mail}}</td> + <td>{{user.qualification}}</td> + <td>{{user.role}}</td> + <td><a class="btn btn-danger" ng-click="deleteUser(user.id)">Delete</a></td> + </tr> + </table> + </div> +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.