ONOS-1937, ONOS-1938 - CORD-GUI -- User view CSS finished, icon appears when changes are applied, masthead has ONOS bird over the CORD logo.

Change-Id: I5ca6fe7cc43509f03edb8ac12285dfb0ba957fca
diff --git a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html
index 1de09bb..adc672f 100644
--- a/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html
+++ b/apps/demo/cord-gui/src/main/webapp/app/view/user/user.html
@@ -2,32 +2,48 @@
 <div class="container">
     <nav></nav>
     <div id="user">
-        <table class="user-info">
-            <tr>
-                <th>Name</th>
-                <th>Mac</th>
-                <th ng-if="isFamily">Select Site Rating</th>
-            </tr>
-            <tr ng-repeat="user in users" class="fadein">
-                <td>{{user.name}}</td>
-                <td>{{user.mac}}</td>
-            </tr>
-        </table>
+        <div class="main-left" ng-class="{family: isFamily}">
+            <table class="user-info">
+                <tr>
+                    <th class="topLeft">Name</th>
+                    <th ng-class="{topRight: !isFamily}">Mac</th>
+                </tr>
+                <tr ng-repeat="user in users" class="fadein">
+                    <td>{{user.name}}</td>
+                    <td>{{user.mac}}</td>
+                </tr>
+            </table>
+        </div>
 
-        <form ng-if="isFamily"
-                name="changeLevels">
-            <select ng-repeat-start="user in users" class="fadein"
-                    ng-init="newLevels[user.id]=user.profile.url_filter.level"
-                    ng-model="newLevels[user.id]"
-                    ng-options="l for l in levels">
-            </select>
-            <br ng-repeat-end>
-            <input type="reset" value="Cancel"
-                    ng-click="cancelChanges(changeLevels)"
-                    ng-disabled="changeLevels.$pristine">
-            <input type="button" value="Apply"
-                    ng-click="applyChanges()"
-                    ng-disabled="changeLevels.$pristine">
-        </form>
+        <div class="main-right" ng-class="{family: isFamily}">
+            <form ng-if="isFamily"
+                    name="changeLevels">
+                <table class="user-form">
+                    <tr>
+                        <th class="topRight">Select Site Rating</th>
+                    </tr>
+                    <tr ng-repeat="user in users" class="options">
+                        <td>
+                            <select ng-init="newLevels[user.id]=user.profile.url_filter.level"
+                                    ng-model="newLevels[user.id]"
+                                    ng-options="l for l in levels">
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="buttons">
+                            <icon size="20px" id="checkMark"
+                                  ng-show="showCheck"></icon>
+                            <input type="reset" value="Cancel"
+                                   ng-click="cancelChanges(changeLevels)"
+                                   ng-disabled="changeLevels.$pristine">
+                            <input type="button" value="Apply"
+                                   ng-click="applyChanges(changeLevels)"
+                                   ng-disabled="changeLevels.$pristine">
+                        </td>
+                    </tr>
+                </table>
+            </form>
+        </div>
     </div>
 </div>
\ No newline at end of file