Skip to content

Commit

Permalink
Added all submenu to Index pages. Partials styling progress
Browse files Browse the repository at this point in the history
  • Loading branch information
JunYam committed Mar 16, 2014
1 parent 46b4634 commit 6cbcc8a
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 40 deletions.
13 changes: 7 additions & 6 deletions src/main/webapp/Partials/assign-manager.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<content>
<h1 class="secondary">Assign Manager to Project</h1>
<h1 class="secondary">Assign Manager to Project</h1><br />
<div ng-controller="ManagerController">
<div class="row">
<p class="col-xs-3">Project No.: PR0111
</p>
<p class="col-xs-3">Project Name: MOSAICS</p>
<div class="col-lg-4">Project No.: PR0111</div>
<div class="col-lg-4">Project Name: MOSAICS</div>
</div>
<div class="row">
<form action="" class="form-inline">
<div class="col-lg-12">
<form action="" class="form-inline">
<p>Search Project Manager: <input ng-model="query" type="text" placeholder="search" class="form-control" /></p>
</form>
</form>
</div>
</div>
<div class="row table-wrapper">
<div class="table-responsive">
Expand Down
42 changes: 23 additions & 19 deletions src/main/webapp/Partials/create-project.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
<content>
<div ng-controller="CreateProjectsController">
<h1 class="secondary">Create Project</h1><br />
<div class="row">
<h1 class="secondary">Create Project</h1>
<p>Start Date: <input type="text" /></p>
<div class = "col-lg-12">
<div class="col-lg-2">Start Date:</div>
<div class="col-lg-3"><input type="date" class="form-control"></div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<p>Project No: <input type="text" ng-model=""></p>
<p>Project Name: <input type="text" ng-model=""></p>
<p>Assigned Manager: <input type="text" ng-model=""></p>
</div>
<div class="col-sm-6">
<p>Budget: <input type="text" ng-model=""></p>
<p>Estimate at Completion: <input type="text" ng-model=""></p>
<p>Client Rate: <input type="text" ng-model=""></p>
</div>
</div>
<div class="row">
<button class="btn btn-primary pull-right">Add New Row</button>
</div>
<div class="row">
<button class="btn btn-primary pull-right">Save</button>
<div class="well">
<div class="row">
<div class="col-lg-2"><p>Project No: </p></div>
<div class="col-lg-4"><input type="text" ng-model="" class="form-control"></div>
<div class="col-lg-2"><p>Project Name: </p></div>
<div class="col-lg-4"><input type="text" ng-model="" class="form-control"></div>
<div class="col-lg-12"><br /> </div>
<div class="col-lg-2"><p>Budget: </p></div>
<div class="col-lg-4"><input type="text" ng-model="" class="form-control"></div>
<div class="col-lg-2"><p>Estimate at Completion:</p></div>
<div class="col-lg-4"><input type="text" ng-model="" class="form-control"></div>
<div class="col-lg-12"><br /> </div>
<div class="col-lg-6"><a href="#/assign-manager" >Assigned Manager</a></div>
<div class="col-lg-6"><a href="#/rate-sheet" >Client Rate</a></div>
</div>
<div class="row">
<div class = "col-lg-12"><button class="btn btn-primary pull-right">Save</button></div>
</div>
</div>
</div>
</content>
5 changes: 3 additions & 2 deletions src/main/webapp/Partials/edit-pay-rates.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<content>
<div ng-controller="EditPayRatesController">
<div ng-controller="EditPayRatesController" class="col-lg-6 col-lg-offset-2">
<h1 class="secondary">Edit Pay Rates</h1>
<div class="table-responsive">
<table class="table table-hover table-bordered">
<table class="table table-hover">
<tbody>
<tr ng-repeat="p in payRates">
<td>{{p.pLevel}}</td>
<td><input type="text" ng-change="change(p)" ng-model="p.rate"/></td>
</tr>
</tbody>
</table>
<br />
<button class="btn btn-primary" ng-click="edit()">Save</button>
</div>
</div>
Expand Down
14 changes: 8 additions & 6 deletions src/main/webapp/Partials/login.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<content>
<div ng-controller="LoginController">
<div ng-controller="LoginController" class="col-lg-6 col-lg-offset-2 well" id="login">
<h1>Project Management System</h1>
<label for="userName">User Name:</label>
<input type="text" class="form-control" ng-model="username" id = "userName" placeholder="Enter user name" required />
<label for="userName">Password:</label>
<input type="text" class="form-control" ng-model="password" id = "password" placeholder="Password" required /><br />
<input type="submit" class="btn btn-primary" ng-click="login()" value="Login" />
<form>
<label for="userName">User Name:</label>
<input type="text" class="form-control" ng-model="username" id = "userName" placeholder="Enter user name" required /><br />
<label for="userName">Password:</label>
<input type="text" class="form-control" ng-model="password" id = "password" placeholder="Password" required /><br />
<input type="submit" class="btn btn-primary" ng-click="login()" value="Login" /><br /><br />
</form>
</div>
</content>
1 change: 1 addition & 0 deletions src/main/webapp/Partials/manage-wp.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<content>
<div ng-controller="WPManagementController">
<h1 class="secondary">Manage WP</h1><br />
<div class="row">
<p class="col-xs-3">Project No.
<select ng-model="project" ng-change="listWP(project)" ng-options="p.projectNumber for p in projects">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/Partials/search-project.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<content>
<h1 class="secondary">Search by Project</h1>
<h1 class="secondary">Search by Project</h1><br />
</content>
10 changes: 7 additions & 3 deletions src/main/webapp/Partials/user-management-hr.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<content>
<div ng-controller="UsersManagementController">
<h1 class="secondary">User Management</h1>
<h1 class="secondary">User Management - HR</h1><br />
<div class="row">
<form action="" class="form-inline col-xs-8">
<p>Search Employees: <input type="text" placeholder="search" class="form-control" ng-model="query.id" /></p>
</form>
<a href="#/edit-pay-rates" id="edit" data-toggle="modal" data-target="#editModal" class="pull-right">Edit Pay Rates</a>
</div>
<!-- <a href="#/edit-pay-rates" id="edit" data-toggle="modal" data-target="#editModal" class="pull-right">Edit Pay Rates</a> -->
<a href="#/edit-pay-rates" id="edit" class="pull-right">Edit Pay Rates</a>

</div>
<div class="row usertable">
<div class="table-responsive">
<table class="table table-striped table-hover table-bordered">
Expand Down Expand Up @@ -44,6 +46,8 @@ <h1 class="secondary">User Management</h1>
<button class="btn btn-primary pull-right" ng-click="edit()">Save</button>
</div>



<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
Expand Down
10 changes: 7 additions & 3 deletions src/main/webapp/Partials/user-management-super.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<content>
<h1 class="secondary">User Management - Supervisor</h1><br />
<div class="row">
<form action="" class="form-inline col-xs-8">
<p>Search WP Number: <input type="text" placeholder="search" class="form-control" /></p>
</form>
<a href="#" id="edit" data-toggle="modal" data-target="#editModal" class="pull-right">Edit Pay Rates</a>
<!-- <a id="edit" data-toggle="modal" data-target="#editModal" class="pull-right">Edit Pay Rates</a> -->
<a href="#/edit-pay-rates" id="edit" class="pull-right">Edit Pay Rates</a>

</div>
<div class="row">
<div class="table-responsive">
Expand All @@ -29,8 +32,8 @@
<td></td>
<td><select name="" id=""><option value="">P5</option></select></td>
<td><select name="" id=""><option value=""></option></select></td>
<td><a href="/assign-project.shtml">Assign</a></td>
<td><a href="/assign-project.shtml">Assign</a></td>
<td><a href="#/assign-project">Assign</a></td>
<td><a href="#/assign-wp">Assign</a></td>
<td><select name="" id=""><option value="">Active</option></select></td>
</tr>
<tr>
Expand Down Expand Up @@ -104,6 +107,7 @@
<button class="btn btn-primary pull-right">Save</button>
</div>


<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
Expand Down
18 changes: 18 additions & 0 deletions src/main/webapp/css/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
body {
font-family: "Lato";
font-weight: 300;
font-size: 16px;
-webkit-font-smoothing: antialiased;
-webkit-overflow-scrolling: touch;
}

/* Titles */
h1, h2, h3, h4, h5, h6 {
font-family: "Raleway";
font-weight: 300;
}

#login{
margin-top: 50px;
}

.html .body .bg-primary {
background: #1b325f; }

Expand Down

0 comments on commit 6cbcc8a

Please sign in to comment.