Skip to content

Commit

Permalink
updated ui
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Spratley committed Dec 6, 2014
1 parent f6ef14b commit fe4af0e
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 200 deletions.
2 changes: 1 addition & 1 deletion app/styles/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ html {
}

.cms-sidebar.closed .well {
width: 45px;
width: 65px;

}

Expand Down
102 changes: 0 additions & 102 deletions app/views/admin.html
View file
Original file line number Diff line number Diff line change
@@ -1,102 +0,0 @@

<div class="container">
<div class="row row-offcanvas row-offcanvas-left">
<div class="col-xs-3 col-sm-3 col-md-2 sidebar-offcanvas" id="sidebar" role="navigation" ng-include src="'views/_sidebar.html'"></div>
<div class="col-xs-8 col-sm-9 col-md-10">
<p class="pull-left visible-xs">
<button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas">Toggle nav</button></p>
<div class="well well-sm">
<button type="button" class="close" aria-hidden="true">
<small>&times;</small>
</button>
<h2>Welcome to Angular-CMS!</h2>
<p>Here are some links to help get you started:</p><br>
<div class="row">
<div class="col-xs-4 col-sm-4 col-md-4 hidden-xs">
<p><strong>Get Started</strong></p>
<p><a href="#/themes" class="btn btn-primary btn-lg hidden-sm">Customize Your Site</a></p>
</div>
<div class="col-xs-6 col-sm-4 col-md-4">
<p><strong>Next Steps</strong></p>
<p><i class="glyphicon glyphicon-edit"></i> <a href="#/plugins"> Add some plugins</a></p>
<p><i class="glyphicon glyphicon-upload"></i> <a href="#/media"> Upload media</a></p>
</div>
<div class="col-xs-6 col-sm-4 col-md-4">
<p><strong>More Actions</strong></p>
<p><i class="glyphicon glyphicon-user"></i> <a href="#/users"> Manage Users</a></p>
<p><i class="glyphicon glyphicon-cog"></i> <a href="#/settings"> Site Settings</a></p>
</div>
</div>
</div>
<div class="row">
<div class="col-6 col-sm-6 col-lg-6">
<div class="panel panel-default">
<header class="panel-heading">Overview</header>
<section class="panel-body">
<div class="row">
<div class="col-6 col-sm-6">
<legend>Content</legend>
<ul class="list-unstyled">
<li>
<span class="badge">42</span> Pages</li>
<li>
<span class="badge">2</span> Categories</li>
<li>
<span class="badge">5</span> Tags</li>
<li>
<span class="badge">23</span> Files</li>
<li>
<span class="badge">5</span> Plugins</li>
</ul>
</div>
<div class="col-6 col-sm-6">
<legend>System</legend>
</div>
</div>
<p>You are using <strong>Angular-CMS 0.1.0</strong></p>
</section>
<div class="panel-footer clearfix">
<button class="btn pull-left hidden-sm btn-default" type="reset">Check for Update</button>
<button class="btn btn-primary pull-right">Install Plugin</button>
</div>
</div>
<p></p>
</div>
<!--/span-->
<div class="col-6 col-sm-6 col-mg-6 col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">Quick Post
</div>
<div class="panel-body">
<form>
<div class="form-group">
<div class="controls">
<input type="text" class="form-control" placeholder="Enter title here...">
</div>
</div>
<div class="form-group">
<div class="controls">
<textarea class="form-control" rows="3"></textarea>
</div>
</div>
<div class="form-group">
<div class="controls">
<input type="text" class="form-control" placeholder="Tags (separate with commas)">
</div>
</div>
</form>
</div>
<div class="panel-footer clearfix">
<button class="btn pull-left btn-default" type="button">Save Draft</button>
<button class="btn btn-primary pull-right">Publish</button>
</div>
</div>
</div>
<!--/span-->
<!--/row-->
</div>
</div>
<!--/span-->
</div>
<!--/row-->

210 changes: 113 additions & 97 deletions app/views/users.html
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div id="users" ng-init="getUsers()">

<h1><i class="fa fa-1x fa-group"></i> Users
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#user-modal" ng-click="user = {}">
New User
</button>
<button class="btn btn-default btn-sm" ng-click="getUsers()">Refresh</button>
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#user-modal" ng-click="user = {}">
New User
</button>
<button class="btn btn-default btn-sm" ng-click="getUsers()">Refresh</button>
</h1>
<hr>

Expand All @@ -13,37 +13,39 @@ <h1><i class="fa fa-1x fa-group"></i> Users
<div class="table-responsive">
<table class="table table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="tc"><input type="checkbox"></th>
<th>E-mail</th>
<th>Username</th>
<th>Active</th>
<th>Created</th>
<th class="actions">Actions</th>
</tr>
<tr>
<th class="tc"><input type="checkbox"></th>
<th>E-mail</th>
<th>Username</th>
<th>Active</th>
<th>Created</th>
<th class="actions">Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in users">
<td class="tc">
<input type="checkbox" value="{{user._id}}">
</td>
<td> {{user.email}} </td>
<td>
{{ user.username }}
<!--span class="label label-primary" ng-repeat="group in user.groups">{{group}}</span-->
</td>
<td> {{user.active}} </td>
<td> {{user.created | date:'medium'}} </td>
<td class="actions">
<tr ng-repeat="user in users">
<td class="tc">
<input type="checkbox" value="{{user._id}}">
</td>
<td> {{user.email}}</td>
<td>
{{ user.username }}
<span class="label label-primary" ng-repeat="group in user.groups">{{group}}</span>
</td>
<td> {{user.active}}</td>
<td> {{user.created | date:'medium'}}</td>
<td class="actions">
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm" ng-click="selectUser(user);" data-toggle="modal" data-target="#user-modal">
<button type="button" class="btn btn-default btn-sm" ng-click="selectUser(user);" data-toggle="modal"
data-target="#user-modal">
<i class="fa fa-edit"></i>
</button>
<button type="button" class="btn btn-default btn-sm" ng-click="deleteUser($index, user);">
<i class="fa fa-trash-o"></i>
</button>
</div></td>
</tr>
</div>
</td>
</tr>
</tbody>
</table>
</div>
Expand All @@ -65,80 +67,94 @@ <h4 class="modal-title" ng-show="user._id">Edit User</h4>
<form name="UserForm" class="form-horizontal" ng-submit="addUser(user)">

<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Username:</label>
<div class="controls col-sm-9 col-xs-9">
<input type="text" class="form-control" placeholder="Username" ng-model="user.username" autofocus>
<label class="control-label col-sm-3 col-xs-3">Username:</label>

<div class="controls col-sm-9 col-xs-9">
<input type="text" class="form-control" placeholder="Username" ng-model="user.username"
autofocus>
</div>
</div>


<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Email:</label>

<div class="controls col-sm-9 col-xs-9">
<input type="email" class="form-control" placeholder="Email" ng-model="user.email"
ng-disabled="user._id">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Password:</label>

<div class="controls col-sm-9 col-xs-9">
<input type="password" class="form-control" placeholder="Password" ng-model="user.password">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Group:</label>

<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Email:</label>
<div class="controls col-sm-9 col-xs-9">
<input type="email" class="form-control" placeholder="Email" ng-model="user.email" ng-disabled="user._id">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Password:</label>
<div class="controls col-sm-9 col-xs-9">
<input type="password" class="form-control" placeholder="Password" ng-model="user.password">
</div>
</div>
<!--div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Group:</label>
<div class="controls col-sm-9 col-xs-9">
<select ng-model="user.groups" class="form-control" multiple="" ng-options="group for group in groups">
</select>
</div>
</div-->

<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Name:</label>
<div class="controls col-sm-9 col-xs-9">
<input type="text" class="form-control" placeholder="Name" ng-model="user.meta.name">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Summary:</label>
<div class="controls col-sm-9 col-xs-9">
<textarea class="form-control" placeholder="Enter 50 words or less..." ng-model="user.meta.summary"></textarea>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Active:</label>
<div class="controls col-sm-9 col-xs-9">
<input type="checkbox" class="form-control" placeholder="Name" ng-model="user.active">
</div>
</div>
</form>
</div>
<div class="col-sm-4 col-xs-5">
<aside class="profile-pic center">

<div class="well well-sm">
<img ng-src="{{ user.email | gravatar }}" alt="{{App.session.user.username}}"/>

<br/>
<small> To change visit <a href="gravatar.com" target="_blank">gravatar.com</a> </small>
</div>
</aside>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
Close
</button>
<button type="button" class="btn btn-primary" ng-click="addUser(user)" ng-disabled="!UserForm.$valid">
Submit
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="controls col-sm-9 col-xs-9">
<select ng-model="user.groups" class="form-control" multiple=""
ng-options="group for group in groups">

</select>

</div>
</div>

<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Name:</label>

<div class="controls col-sm-9 col-xs-9">
<input type="text" class="form-control" placeholder="Name" ng-model="user.meta.name">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Summary:</label>

<div class="controls col-sm-9 col-xs-9">
<textarea class="form-control" placeholder="Enter 50 words or less..."
ng-model="user.meta.summary"></textarea>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3 col-xs-3">Active:</label>

<div class="controls col-sm-9 col-xs-9">
<input type="checkbox" class="form-control" placeholder="Name" ng-model="user.active">
</div>
</div>
</form>
</div>
<div class="col-sm-4 col-xs-5">
<aside class="profile-pic center">

<div class="well well-sm">
<img ng-src="{{ user.email | gravatar }}" alt="{{App.session.user.username}}"/>

<br/>
<small> To change visit <a href="gravatar.com" target="_blank">gravatar.com</a></small>
</div>
</aside>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
Close
</button>
<button type="button" class="btn btn-primary" ng-click="addUser(user)" ng-disabled="!UserForm.$valid">
Submit
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
</div>
</div>
</div>

0 comments on commit fe4af0e

Please sign in to comment.