ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject [1/2] AMBARI-6763. Admin View: E2E integration. (yusaku)
Date Wed, 06 Aug 2014 23:50:48 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk abf09efda -> 3e1ad2a4a


http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index 7ed920b..0e3b9a1 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -15,6 +15,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li><a href="#/views">Views</a></li>
+  <li class="active">Edit instance</li>
+</ol>
 <h2>Edit {{instance.ViewInstanceInfo.view_name}}: {{instance.ViewInstanceInfo.label}}</h2>
 <hr>
 <div class="panel panel-default">
@@ -46,8 +50,8 @@
         </div>
         <div class="form-group" ng-hide="editSettingsDisabled">
           <div class="col-sm-offset-2 col-sm-10">
-            <button class="btn btn-warning pull-right left-margin" ng-click="cancelSettings()">Cancel</button>
-            <button class="btn btn-success pull-right" ng-click="saveSettings()">Save</button>
+            <button class="btn btn-primary pull-right left-margin" ng-click="saveSettings()">Save</button>
+            <button class="btn btn-default pull-right" ng-click="cancelSettings()">Cancel</button>
           </div>
         </div>
       </fieldset>
@@ -55,22 +59,50 @@
   </div>
 </div>
 
-<div class="panel panel-default" style="">
-  <div class="panel-heading">
-    <h3 class="panel-title">Permissions</h3>
+<div class="panel panel-default views-permissions-panel" style="">
+  <div class="panel-heading clearfix">
+    <h3 class="panel-title pull-left">Permissions</h3>
+    <div class="pull-right">
+      <a href ng-click="editPermissionDisabled = !editPermissionDisabled" ng-show="editPermissionDisabled">
<span class="glyphicon glyphicon-cog"></span> Edit</a>
+    </div>
   </div>
   <div class="panel-body">
-      
     <form class="form-horizontal">
       <div class="form-group">
         <div class="col-sm-2"></div>
         <label class="col-sm-5 control-label text-left">Users</label>
         <label class="col-sm-5 control-label text-left">Groups</label>
       </div>
-      <div class="form-group">
-        <label class="col-sm-2 control-label">USE</label>
-        <div class="col-sm-5"><textarea name="" id="" cols="30" rows="4" class="form-control"></textarea></div>
-        <div class="col-sm-5"><textarea name="" id="" cols="30" rows="4" class="form-control"></textarea></div>
+      <div class="form-group" ng-repeat="permission in permissions">
+        <label class="col-sm-2 control-label">{{permission.PermissionInfo.permission_name}}</label>
+        <div class="col-sm-5" ng-switch="editPermissionDisabled">
+          <textarea name="" id="" cols="30" rows="4" class="form-control" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].USER"
ng-switch-when="false"></textarea>
+          <div class="well" ng-switch-when="true">
+            <span ng-repeat="user in permission.USER">
+              <link-to route="users.show" id="{{user}}">{{user}}</link-to>
+              <button type="button" class="close remove-button" 
+                ng-click="removePermission(permission.name, 'USER', user)"><span aria-hidden="true">&times;</span><span
class="sr-only">Close</span></button>
+              {{$last ? '' :', '}}
+            </span>
+          </div>
+        </div>
+        <div class="col-sm-5" ng-switch="editPermissionDisabled">
+          <textarea name="" id="" cols="30" rows="4" class="form-control" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].GROUP"
ng-switch-when="false"></textarea>
+          <div class="well" ng-switch-when="true">
+            <span ng-repeat="group in permission.GROUP">
+              <link-to route="groups.edit" id="{{group}}" >{{group}}</link-to>
+              <button type="button" class="close remove-button" 
+                ng-click="removePermission(permission.name, 'GROUP', group)"><span
aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              {{$last ? '' :', '}}
+            </span>
+          </div>
+        </div>
+      </div>
+      <div class="form-group" ng-hide="editPermissionDisabled">
+        <div class="col-sm-offset-2 col-sm-10">
+          <button class="btn btn-primary pull-right left-margin" ng-click="savePermissions()">Save</button>
+          <button class="btn btn-default pull-right" ng-click="cancelPermissions()">Cancel</button>
+        </div>
       </div>
     </form>
       
@@ -93,11 +125,11 @@
         </div>
         <div class="form-group" ng-hide="editConfigurationDisabled">
           <div class="col-sm-offset-2 col-sm-10">
-            <button class="btn btn-warning pull-right left-margin" ng-click="cancelConfiguration()">Cancel</button>
-            <button class="btn btn-success pull-right" ng-click="saveConfiguration()">Save</button>
+            <button class="btn btn-primary pull-right left-margin" ng-click="saveConfiguration()">Save</button>
+            <button class="btn btn-default pull-right" ng-click="cancelConfiguration()">Cancel</button>
           </div>
         </div>
       </fieldset>
     </form>
   </div>
-</div>
\ No newline at end of file
+</div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/list.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/list.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/list.html
index 673f690..23290d4 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/list.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/list.html
@@ -15,12 +15,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li class="active">Views</li>
+</ol>
 <div class="views-list-pane">
   <div class="clearfix">
-    <h3 class="pull-left">Views management</h3>
+    <h3 class="pull-left">Views</h3>
     <div class="pull-right top-buffer col-sm-4">
       <div class="input-group">
-        <input type="text" class="form-control" placeholder="Search" ng-model="viewsFilter">
+        <input type="text" class="form-control" placeholder="Search" ng-model="viewsFilter"
ng-change="getFilteredViews()">
         <span class="input-group-addon">
           <span class="glyphicon glyphicon-search"></span>
         </span>
@@ -28,8 +31,14 @@
     </div>
   </div>
   <hr>
+  <div class="row">
+    <div class="col-sm-3 padding-left-30"><h4>View Name</h4></div>
+    <div class="col-sm-3"><h4>Versions</h4></div>
+    <div class="col-sm-3"><h4>Instances</h4></div>
+    <div class="col-sm-3"><h4>Descirption</h4></div>
+  </div>
   <accordion>
-    <accordion-group ng-repeat="view in views">
+    <accordion-group ng-repeat="view in filteredViews">
       <accordion-heading>
         <div class="row">
           <div class="col-sm-3">{{view.view_name}}</div>
@@ -58,9 +67,7 @@
             <td class="col-sm-3"></td>
             <td class="col-sm-3"></td>
             <td class="col-sm-3">
-              <a href class="btn btn-default" ng-click="createInstance(view)">
-                <span class="glyphicon glyphicon-plus" ></span> Create Instance
-              </a>
+              <a class="btn btn-default" href="#/views/{{view.view_name}}/versions/{{view.versionsList[view.versionsList.length-1].ViewVersionInfo.version}}/new"><span
class="glyphicon glyphicon-plus" ></span> Create Instance</a>
             </td>
           </tr>
         </tfoot>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html
index 14fce03..9b15f44 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html
@@ -121,7 +121,7 @@
   
 </div>
 <div class="modal-footer">
-  <button class="btn btn-warning" ng-click="cancel()">Cancel</button>
-  <button class="btn btn-success" ng-click="save()" type="submit">Save</button>
+  <button class="btn btn-default" ng-click="cancel()">Cancel</button>
+  <button class="btn btn-primary" ng-click="save()" type="submit">Save</button>
 </div>
 </form>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/edit.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/edit.html
new file mode 100644
index 0000000..8516bad
--- /dev/null
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/edit.html
@@ -0,0 +1,138 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<div class="modal-header">
+  <h3 class="modal-title">Edit {{instance.ViewInstanceInfo.view_name}}: {{instance.ViewInstanceInfo.label}}</h3>
+</div>
+<div class="modal-body">
+  <div class="panel panel-default">
+    <div class="panel-heading clearfix">
+      <h3 class="panel-title pull-left">Settings</h3>
+      <div class="pull-right">
+        <a href ng-click="edit.editSettingsDisabled = !edit.editSettingsDisabled" ng-show="edit.editSettingsDisabled">
<span class="glyphicon glyphicon-cog"></span> Edit</a>
+      </div>
+    </div>
+    <div class="panel-body">
+      <form class="form-horizontal">
+        <fieldset ng-disabled="edit.editSettingsDisabled">
+          <div class="form-group">
+            <label for="" class="col-sm-2 control-label">Instance ID</label>
+            <label for="" class="col-sm-10 control-label text-left">{{instance.ViewInstanceInfo.instance_name}}</label>
+          </div>
+          <div class="form-group">
+            <label for="" class="col-sm-2 control-label">Display Name</label>
+            <div class="col-sm-10"><input type="text" class="form-control" placeholder="Display
Name" ng-model="settings.label"></div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+              <div class="checkbox">
+                <label>
+                  <input type="checkbox" ng-model="settings.visible"> Visible
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group" ng-hide="edit.editSettingsDisabled">
+            <div class="col-sm-offset-2 col-sm-10">
+              <button class="btn btn-default pull-right left-margin" ng-click="cancelSettings()">Cancel</button>
+              <button class="btn btn-primary pull-right" ng-click="saveSettings()">Save</button>
+            </div>
+          </div>
+        </fieldset>
+      </form>
+    </div>
+  </div>
+
+  <div class="panel panel-default views-permissions-panel" style="">
+    <div class="panel-heading clearfix">
+      <h3 class="panel-title pull-left">Permissions</h3>
+      <div class="pull-right">
+        <a href ng-click="edit.editPermissionDisabled = !edit.editPermissionDisabled"
ng-show="edit.editPermissionDisabled"> <span class="glyphicon glyphicon-cog"></span>
Edit</a>
+      </div>
+    </div>
+    <div class="panel-body">
+      <form class="form-horizontal">
+        <div class="form-group">
+          <div class="col-sm-2"></div>
+          <label class="col-sm-5 control-label text-left">Users</label>
+          <label class="col-sm-5 control-label text-left">Groups</label>
+        </div>
+        <div class="form-group" ng-repeat="permission in permissions">
+          <label class="col-sm-2 control-label">{{permission.PermissionInfo.permission_name}}</label>
+          <div class="col-sm-5" ng-switch="edit.editPermissionDisabled">
+            <textarea name="" id="" cols="30" rows="4" class="form-control" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].USER"
ng-switch-when="false"></textarea>
+            <div class="well" ng-switch-when="true">
+              <span ng-repeat="user in permission.USER">
+                <link-to route="users.show" id="{{user}}">{{user}}</link-to>
+                <button type="button" class="close remove-button" 
+                  ng-click="removePermission(permission.name, 'USER', user)"><span
aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                {{$last ? '' :', '}}
+              </span>
+            </div>
+          </div>
+          <div class="col-sm-5" ng-switch="edit.editPermissionDisabled">
+            <textarea name="" id="" cols="30" rows="4" class="form-control" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].GROUP"
ng-switch-when="false"></textarea>
+            <div class="well" ng-switch-when="true">
+              <span ng-repeat="group in permission.GROUP">
+                <link-to route="groups.edit" id="{{group}}" >{{group}}</link-to>
+                <button type="button" class="close remove-button" 
+                  ng-click="removePermission(permission.name, 'GROUP', group)"><span
aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                {{$last ? '' :', '}}
+              </span>
+            </div>
+          </div>
+        </div>
+        <div class="form-group" ng-hide="edit.editPermissionDisabled">
+          <div class="col-sm-offset-2 col-sm-10">
+            <button class="btn btn-default pull-right left-margin" ng-click="cancelPermissions()">Cancel</button>
+            <button class="btn btn-primary pull-right" ng-click="savePermissions()">Save</button>
+          </div>
+        </div>
+      </form>
+        
+    </div>
+  </div>
+
+  <div class="panel panel-default">
+    <div class="panel-heading clearfix">
+      <h3 class="panel-title pull-left">Configuration</h3>
+      <div class="pull-right">
+        <a href ng-click="edit.editConfigurationDisabled = !edit.editConfigurationDisabled"
ng-show="edit.editConfigurationDisabled"> <span class="glyphicon glyphicon-cog"></span>
Edit</a>
+      </div>
+    </div>
+    <div class="panel-body">
+      <form action="" class="form-horizontal">
+        <fieldset ng-disabled="edit.editConfigurationDisabled">
+          <div class="form-group" ng-repeat="(propertyName, propertyValue) in configuration">
+            <label for="" class="control-label col-sm-3">{{propertyName}}</label>
+            <div class="col-sm-9"><input type="text" class="form-control" ng-model="configuration[propertyName]"></div>
+          </div>
+          <div class="form-group" ng-hide="edit.editConfigurationDisabled">
+            <div class="col-sm-offset-2 col-sm-10">
+              <button class="btn btn-default pull-right left-margin" ng-click="cancelConfiguration()">Cancel</button>
+              <button class="btn btn-primary pull-right" ng-click="saveConfiguration()">Save</button>
+            </div>
+          </div>
+        </fieldset>
+      </form>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <button class="btn btn-default" ng-click="close()">Close</button>
+</div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html
index 89e495d..8074fae 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html
@@ -15,9 +15,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li class="active">Cluster Permissions</li>
+</ol>
 <div class="cluster-manage-access-pane">
   <div class="clearfix">
-    <h3 class="pull-left">My Cluster Permissions</h3>
+    <h3 class="pull-left">{{clusterName}} Permissions</h3>
     <div class="pull-right top-buffer">
       <a href class="btn btn-primary"  ng-click="toggleEditMode()"><span class="glyphicon
glyphicon-pencil"></span> Edit</a>
     </div>
@@ -29,35 +32,35 @@
       <label class="col-sm-5 control-label text-left">Users</label>
       <label class="col-sm-5 control-label text-left">Groups</label>
     </div>
-    <div class="form-group">
-      <label class="col-sm-2 control-label">READ</label>
+    <div class="form-group" ng-repeat="permission in permissions">
+      <label class="col-sm-2 control-label">{{permission.PermissionInfo.permission_name}}</label>
       <div class="col-sm-5" ng-switch="isEditMode">
-        <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control"
ng-model="permissions.read.users"></textarea>
+        <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control"
ng-model="permissionsEdit[permission.PermissionInfo.permission_name].USER"></textarea>
         <div class="well" ng-switch-default>
-          <a href="#" ng-repeat="user in permissions.read.users">{{user}}{{$last ?
'' :', '}}</a>
+          <span ng-repeat="user in permission.USER">
+            <link-to route="users.show" id="{{user}}" >{{user}}</link-to>
+            <button type="button" class="close remove-button" 
+              ng-click="removePermission(permission.PermissionInfo.permission_name, 'USER',
user)"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            {{$last ? '' :', '}}
+          </span>
         </div>
       </div>
       <div class="col-sm-5" ng-switch="isEditMode">
-        <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control"
ng-model="permissions.read.groups"></textarea>
+        <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control"
ng-model="permissionsEdit[permission.PermissionInfo.permission_name].GROUP"></textarea>
         <div class="well" ng-switch-default>
-          <a href="#" ng-repeat="group in permissions.read.groups">{{group}}{{$last
? '' :', '}}</a>
+          <span ng-repeat="group in permission.GROUP">
+            <link-to route="groups.edit" id="{{group}}">{{group}}</link-to>
+            <button type="button" class="close remove-button" 
+              ng-click="removePermission(permission.PermissionInfo.permission_name, 'GROUP',
group)"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            {{$last ? '' :', '}}
+          </span>
         </div>
       </div>
     </div>
-    <div class="form-group">
-      <label class="col-sm-2 control-label">OPERATE</label>
-      <div class="col-sm-5" ng-switch="isEditMode">
-        <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control"
ng-model="permissions.operate.users"></textarea>
-        <div class="well" ng-switch-default>
-          <a href="#" ng-repeat="user in permissions.operate.users">{{user}}{{$last
? '' :', '}}</a>
-        </div>
-      </div>
-      <div class="col-sm-5" ng-switch="isEditMode">
-        <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control"
ng-model="permissions.operate.groups"></textarea>
-        <div class="well" ng-switch-default>
-          <a href="#" ng-repeat="group in permissions.operate.groups">{{group}}{{$last
? '' :', '}}</a>
-        </div>
+    <div class="form-group" ng-show="isEditMode">
+      <div class="col-sm-offset-2 col-sm-10">
+        <button class="btn btn-default pull-right left-margin" ng-click="cancel()">Cancel</button>
+        <button class="btn btn-primary pull-right" ng-click="save()">Save</button>
       </div>
     </div>
-</div>
-
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/create.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/create.html
index e50c4af..5bcc2fc 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/create.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/create.html
@@ -15,13 +15,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li><a href="#/groups">Groups</a></li>
+  <li class="active">Create group</li>
+</ol>
 <h2>Create local group</h2>
 <hr>
 <form class="form-horizontal" role="form" novalidate name="form">
   <div class="form-group" ng-class="{'has-error' : form.user_name.$error.required &&
form.submitted}">
-    <label for="groupname" class="col-sm-2 control-label">Group name:</label>
+    <label for="groupname" class="col-sm-2 control-label">Group name</label>
     <div class="col-sm-10">
-      <input type="text" id="groupname" class="form-control" name="group_name" placeholder="User
name" ng-model="group.group_name" required>
+      <input type="text" id="groupname" class="form-control" name="group_name" placeholder="Group
name" ng-model="group.group_name" required>
       <div class="alert alert-danger top-margin" ng-show="form.group_name.$error.required
&& form.submitted">
         Required
       </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
index 28529aa..1a242e9 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
@@ -15,11 +15,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
-<h2>Edit {{group.group_name}}</h2>
+<ol class="breadcrumb">
+  <li><a href="#/groups">Groups</a></li>
+  <li class="active">Edit group</li>
+</ol>
+<div class="clearfix">
+  <h3 class="pull-left">Edit {{group.group_name}}</h3>
+  <div class="pull-right top-buffer">
+    <button class="btn btn-danger" ng-click="deleteGroup(group)">Delete Group</button>
+  </div>
+</div>
 <hr>
 <form class="form-horizontal group-edit" role="form" novalidate name="form">
   <div class="form-group" ng-class="{'has-error' : form.user_name.$error.required &&
form.submitted}">
-    <label for="groupname" class="col-sm-2 control-label">Group name:</label>
+    <label for="groupname" class="col-sm-2 control-label">Group name</label>
     <div class="col-sm-10">
       <input type="text" id="groupname" class="form-control" disabled="disabled" name="group_name"
placeholder="User name" ng-model="group.group_name" required>
     </div>
@@ -29,7 +38,7 @@
     <div class="col-sm-10">
       <div ng-switch="editMode">
         <div class="well users" ng-switch-when="false">
-          <span ng-repeat="member in group.members" >
+          <span ng-repeat="member in groupMembers" >
             <link-to route='users.show' id="{{member}}">
               {{member}}
             </link-to>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html
index fb2f5ea..baa7038 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html
@@ -15,6 +15,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li class="active">Groups</li>
+</ol>
 <div class="groups-pane">
   <div class="clearfix">
     <h3 class="pull-left">Groups management</h3>
@@ -27,19 +30,35 @@
   <table class="table table-striped table-hover">
     <thead>
       <tr>
-        <th>Group name</th>
-        <th>Type</th>
+        <th>
+          <label for="">Group name</label>
+          
+        </th>
+        <th>
+          <label for="">Type</label>
+          
+        </th>
         <th>Members</th>
         <th></th>
       </tr>
+      <tr>
+        <th><input type="text" class="form-control" ng-model="currentNameFilter"></th>
+        <th>
+          <select class="form-control"
+            ng-model="currentTypeFilter"
+            ng-options="item for item in typeFilterOptions">
+          </select>
+        </th>
+        <th></th>
+      </tr>
     </thead>
     <tbody>
-      <tr ng-repeat="group in groups">
-        <td>{{group.group_name}}</td>
+      <tr ng-repeat="group in groups | filter:typeFilter | filter:currentNameFilter">
+        <td>
+          <link-to route="groups.edit" id="{{group.group_name}}">{{group.group_name}}</link-to>
+        </td>
         <td>{{group.ldap_group ? 'LDAP' : 'Local'}}</td>
         <td>{{group.members.length}} {{group.members.length === 1 ? 'member' : 'members'}}</td>
-        <td>
-          <link-to route="groups.edit" id="{{group.group_name}}"class="btn btn-default">Edit</link-to>
<a href class="btn btn-danger" ng-click="deleteGroup(group)">delete</a></td>
       </tr>
     </tbody>
   </table>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
index 6b095a7..f59931b 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
@@ -21,8 +21,8 @@
     <div ng-show="cluster">
       <h5>{{cluster.Clusters.cluster_name}}</h5>
       <ul class="nav nav-pills nav-stacked">
-        <li>
-          <link-to route="clusters.manageAccess" id="1">Manage Access</link-to>
+        <li ng-class="{active: isActive('clusters.manageAccess')}">
+          <link-to route="clusters.manageAccess" id="{{cluster.Clusters.cluster_name}}">Permissions</link-to>
         </li>
         <li><a href="/#/main/dashboard">Go to Dashboard</a></li>
       </ul>
@@ -42,7 +42,7 @@
   <div class="panel-heading"><span class="glyphicon glyphicon-th"></span>
Views</div>
   <div class="panel-body">
     <ul class="nav nav-pills nav-stacked">
-      <li><link-to route="views.list">Manage Views</link-to></li>
+      <li ng-class="{active: isActive('views.list')}"><link-to route="views.list">Views</link-to></li>
     </ul>
   </div>
 </div>
@@ -51,8 +51,8 @@
   <div class="panel-heading"><span class="glyphicon glyphicon-user"></span>
Users + Groups</div>
   <div class="panel-body">
     <ul class="nav nav-pills nav-stacked">
-      <li><link-to route="users.list">Manage Users</link-to></li>
-      <li><link-to route="groups.list">Manage Groups</link-to></li>
+      <li ng-class="{active: isActive('users.list')}"><link-to route="users.list">Users</link-to></li>
+      <li ng-class="{active: isActive('groups.list')}"><link-to route="groups.list">Groups</link-to></li>
     </ul>
   </div>
-</div>
\ No newline at end of file
+</div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/ConfirmationModal.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/ConfirmationModal.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/ConfirmationModal.html
new file mode 100644
index 0000000..5953d11
--- /dev/null
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/ConfirmationModal.html
@@ -0,0 +1,27 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+<div class="modal-header">
+    <h3 class="modal-title">{{header}}</h3>
+</div>
+<div class="modal-body">
+    {{body}}
+</div>
+<div class="modal-footer">
+    <button class="btn btn-default" ng-click="cancel()">Cancel</button>
+    <button class="btn btn-primary" ng-click="ok()">OK</button>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/users/create.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/create.html
index 6aaf654..7b33c76 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/create.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/create.html
@@ -15,11 +15,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li><a href="#/users">Users</a></li>
+  <li class="active">Create user</li>
+</ol>
 <h2>Create local user</h2>
 <hr>
 <form class="form-horizontal" role="form" novalidate name="form">
   <div class="form-group" ng-class="{'has-error' : form.user_name.$error.required &&
form.submitted}">
-    <label for="username" class="col-sm-2 control-label">User name:</label>
+    <label for="username" class="col-sm-2 control-label">User name</label>
     <div class="col-sm-10">
       <input type="text" id="username" class="form-control" name="user_name" placeholder="User
name" ng-model="user.user_name" required>
       <div class="alert alert-danger top-margin" ng-show="form.user_name.$error.required
&& form.submitted">
@@ -28,7 +32,7 @@
     </div>
   </div>
   <div class="form-group">
-    <label for="" class="col-sm-2 control-label">Type:</label>
+    <label for="" class="col-sm-2 control-label">Type</label>
     <div class="col-sm-10">
       <label for="" class="control-label">Local</label>
     </div>
@@ -40,7 +44,7 @@
     </div>
   </div>
   <div class="form-group" ng-class="{'has-error' : (form.password.$error.required &&
form.submitted) || form.confirmPassword.$error.passwordVerify}">
-    <label for="password" class="col-sm-2 control-label">Password:</label>
+    <label for="password" class="col-sm-2 control-label">Password</label>
     <div class="col-sm-10">
       <input type="password" class="form-control bottom-margin" name="password" placeholder="Password"
required ng-model="user.password">
       <input type="password" class="form-control bottom-margin" name="confirmPassword"
placeholder="Password confirmation" required ng-model="user.passwordConfirmation"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/users/list.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/list.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/list.html
index e644378..c281c70 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/list.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/list.html
@@ -15,6 +15,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li class="active">Users</li>
+</ol>
 <div class="users-pane">
   <div class="clearfix">
     <h3 class="pull-left">Users management</h3>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/changePassword.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/changePassword.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/changePassword.html
index 5e9926d..24f174b 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/changePassword.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/changePassword.html
@@ -47,6 +47,6 @@
   </form>
 </div>
 <div class="modal-footer">
+  <button class="btn btn-default" ng-click="cancel()">Cancel</button>
   <button class="btn btn-primary" ng-click="ok()">OK</button>
-  <button class="btn btn-warning" ng-click="cancel()">Cancel</button>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/deleteUserConfirmation.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/deleteUserConfirmation.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/deleteUserConfirmation.html
deleted file mode 100644
index b87a670..0000000
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/modals/deleteUserConfirmation.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-<div class="modal-header no-border">
-  <h3 class="modal-title">Are you sure?</h3>
-</div>
-<div class="modal-footer">
-  <button class="btn btn-primary" ng-click="delete()">Delete</button>
-  <button class="btn btn-warning" ng-click="cancel()">Cancel</button>
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
index 6b36192..dadb32f 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
@@ -15,6 +15,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
+<ol class="breadcrumb">
+  <li><a href="#/users">Users</a></li>
+  <li class="active">Edit user</li>
+</ol>
 <div ng-show="user.user_name">
   <div class="clearfix">
     <h3 class="pull-left">{{user.user_name}}</h3>
@@ -25,7 +29,7 @@
   <hr>
   <form class="form-horizontal" role="form" >
     <div class="form-group">
-      <label for="" class="col-sm-2 control-label">Type:</label>
+      <label for="" class="col-sm-2 control-label">Type</label>
       <div class="col-sm-10">
         <label for="" class="control-label">Local</label>
       </div>
@@ -41,13 +45,13 @@
       </div>
     </div>
     <div class="form-group">
-      <label for="password" class="col-sm-2 control-label">Password:</label>
+      <label for="password" class="col-sm-2 control-label">Password</label>
       <div class="col-sm-10">
         <a href ng-click="openChangePwdDialog()" class="btn btn-default">Change Password</a>
       </div>
     </div>
     <div class="form-group">
-      <label for="groups" class="col-sm-2 control-label">Groups:</label>
+      <label for="groups" class="col-sm-2 control-label">Groups</label>
       <div class="col-sm-10">
         <div class="row" ng-hide="isGroupEditing">
           <div class="col-sm-10">

http://git-wip-us.apache.org/repos/asf/ambari/blob/3e1ad2a4/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js b/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js
index 484865a..8e5e9e8 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js
@@ -47,7 +47,7 @@ gulp.task('html', ['styles'], function () {
         .pipe($.uglify())
         .pipe(jsFilter.restore())
         .pipe(cssFilter)
-        .pipe($.csso())
+        // .pipe($.csso())
         .pipe(cssFilter.restore())
         .pipe($.useref.restore())
         .pipe($.useref())


Mime
View raw message