From 6cbcc8a26f5f7a71554faa8a94d6be79f216841b Mon Sep 17 00:00:00 2001
From: JunYam <jy5307@gmail.com>
Date: Sun, 16 Mar 2014 02:17:04 -0700
Subject: [PATCH] Added all submenu to Index pages. Partials styling progress

---
 src/main/webapp/Partials/assign-manager.html  | 13 +++---
 src/main/webapp/Partials/create-project.html  | 42 ++++++++++---------
 src/main/webapp/Partials/edit-pay-rates.html  |  5 ++-
 src/main/webapp/Partials/login.html           | 14 ++++---
 src/main/webapp/Partials/manage-wp.html       |  1 +
 src/main/webapp/Partials/search-project.html  |  2 +-
 .../webapp/Partials/user-management-hr.html   | 10 +++--
 .../Partials/user-management-super.html       | 10 +++--
 src/main/webapp/css/app.css                   | 18 ++++++++
 9 files changed, 75 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/Partials/assign-manager.html b/src/main/webapp/Partials/assign-manager.html
index 56c91f1..2ba1361 100644
--- a/src/main/webapp/Partials/assign-manager.html
+++ b/src/main/webapp/Partials/assign-manager.html
@@ -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">
diff --git a/src/main/webapp/Partials/create-project.html b/src/main/webapp/Partials/create-project.html
index 0366a32..6b72933 100644
--- a/src/main/webapp/Partials/create-project.html
+++ b/src/main/webapp/Partials/create-project.html
@@ -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>
diff --git a/src/main/webapp/Partials/edit-pay-rates.html b/src/main/webapp/Partials/edit-pay-rates.html
index 7b9f4d1..3da8d30 100644
--- a/src/main/webapp/Partials/edit-pay-rates.html
+++ b/src/main/webapp/Partials/edit-pay-rates.html
@@ -1,8 +1,8 @@
 <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>
@@ -10,6 +10,7 @@ <h1 class="secondary">Edit Pay Rates</h1>
           </tr>
         </tbody>
       </table>
+      <br />
       <button class="btn btn-primary" ng-click="edit()">Save</button>
    </div>  
   </div>
diff --git a/src/main/webapp/Partials/login.html b/src/main/webapp/Partials/login.html
index e20e883..be38907 100644
--- a/src/main/webapp/Partials/login.html
+++ b/src/main/webapp/Partials/login.html
@@ -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>
\ No newline at end of file
diff --git a/src/main/webapp/Partials/manage-wp.html b/src/main/webapp/Partials/manage-wp.html
index cd25c8c..372ba01 100644
--- a/src/main/webapp/Partials/manage-wp.html
+++ b/src/main/webapp/Partials/manage-wp.html
@@ -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">
diff --git a/src/main/webapp/Partials/search-project.html b/src/main/webapp/Partials/search-project.html
index b3eccbe..3e2f5ae 100644
--- a/src/main/webapp/Partials/search-project.html
+++ b/src/main/webapp/Partials/search-project.html
@@ -1,3 +1,3 @@
 <content>
-  <h1 class="secondary">Search by Project</h1>
+  <h1 class="secondary">Search by Project</h1><br />
 </content>
diff --git a/src/main/webapp/Partials/user-management-hr.html b/src/main/webapp/Partials/user-management-hr.html
index 086354c..951cee5 100644
--- a/src/main/webapp/Partials/user-management-hr.html
+++ b/src/main/webapp/Partials/user-management-hr.html
@@ -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">
@@ -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">
diff --git a/src/main/webapp/Partials/user-management-super.html b/src/main/webapp/Partials/user-management-super.html
index 7482572..e333932 100644
--- a/src/main/webapp/Partials/user-management-super.html
+++ b/src/main/webapp/Partials/user-management-super.html
@@ -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">
@@ -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>
@@ -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">
diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index 802bfb6..2c39667 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -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; }