http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/confirmDelete.js ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/confirmDelete.js b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/confirmDelete.js index 5b465bc..8aaebf5 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/confirmDelete.js +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/confirmDelete.js @@ -48,7 +48,7 @@ App.ClickElsewhereMixin = Ember.Mixin.create({ } }); -App.ComfirmDeleteComponent = Em.Component.extend(App.ClickElsewhereMixin,{ +App.ConfirmDeleteComponent = Em.Component.extend(App.ClickElsewhereMixin,{ confirm:false, onClickElsewhere:function () { this.set('confirm',false);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/router.js ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/router.js b/contrib/views/capacity-scheduler/src/main/resources/ui/app/router.js index fc9108c..ea21d90 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/router.js +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/router.js @@ -78,7 +78,7 @@ App.QueueRoute = Ember.Route.extend({ actions: { refreshQueue: function() { - var x = "{ \"RequestInfo\" : { \"command\" : \"REFRESHQUEUES\", \"context\" : \"Refresh YARN Capacity Scheduler\" }, " + var x = "{ \"RequestInfo\" : { \"command\" : \"REFRESHQUEUES\", \"context\" : \"Refresh YARN Capacity Scheduler\",\"parameters/forceRefreshConfigTags\":\"capacity-scheduler\" }, " x = x + "\"Requests/resource_filters\":[{\"service_name\":\"YARN\",\"component_name\":\"RESOURCEMANAGER\",\"hosts\":\"c6403.ambari.apache.org\"}]}"; App.Adapter.ajaxPost("/api/v1/clusters/MyCluster/requests", x); http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/styles/application.less ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/styles/application.less b/contrib/views/capacity-scheduler/src/main/resources/ui/app/styles/application.less index 94e3996..2f13d09 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/styles/application.less +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/styles/application.less @@ -20,6 +20,54 @@ padding: 15px; } +.queue-label { + float: left; + padding-right: 10px; + min-width: 80px; +} + +.capacity-edit { + padding-left: 80px; +} + +.max-capacity-edit { + padding-left: 10px; +} + +.queue-heading-row .input-group h3 { + margin-bottom: 0; + margin-top: 3px; +} + +.form-horizontal .control-label { + padding-top: 0; + text-align: right; +} + +.form-horizontal .control-value { + padding-top: 5px; +} + +.edit-link { + font-size: .75em; + padding-top: 4px; + } + +.control-label { + font-size: .9em; + } + +.well-queue { + background-color: #ffffff; + border: 1px solid #e3e3e3; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset; + margin-bottom: 20px; + min-height: 20px; + padding: 19px; + padding-top: 5px; + } + .btn { padding: 6px 10px; transition: background-color .08s linear 0s; @@ -198,8 +246,9 @@ } .panel-body.queues { border-top: 1px solid #dddddd; - background-color: #f5f5f5; +// background-color: #f5f5f5; } + .queue-capacity{ border-bottom: 1px solid #dddddd; padding-bottom: 8px; @@ -234,5 +283,6 @@ .queue-heading-row { h3 { margin:10px; + margin-left: 0px; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/capacityEditForm.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/capacityEditForm.hbs b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/capacityEditForm.hbs index 9442973..51e2bb4 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/capacityEditForm.hbs +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/capacityEditForm.hbs @@ -18,12 +18,12 @@ <form {{bind-attr class=":form-inline :capacity-edit-form " }} role="form"> <div {{bind-attr class=":form-group" }}> - <label class="control-label">Capacity: </label> + <label class="control-label capacity-edit">Capacity: </label> {{capacity-input class='input-sm' value=this.capacity totalCapacity=view.totalCapacity queue=this maxVal=100}} </div> <div {{bind-attr class=":form-group this.isValid::has-error" }}> - <label class="control-label">Maximum capacity: </label> + <label class="control-label max-capacity-edit">Max. Capacity: </label> {{max-capacity-input class='input-sm' value=this.maximum_capacity totalCapacity=view.totalCapacity queue=this maxVal=100}} {{#each this.errors.maximum_capacity}} <span class="help-block"> http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/totalCapacity.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/totalCapacity.hbs b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/totalCapacity.hbs index c934081..f6f3c64 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/totalCapacity.hbs +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/totalCapacity.hbs @@ -22,22 +22,22 @@ <strong>Capacity</strong> <a href="#" {{action 'toggleEdit'}} class="text-right"> {{#if view.isEdit}} - <i class="fa fa-edit">Hide edit</i> + <div class="edit-link">Hide Edit</div> {{else}} - <i class="fa fa-edit">Show edit</i> + <div class="edit-link">Show Edit</div> {{/if}} </a> </div> </div> <div class="panel-body total"> - TOTAL - {{capacity-bar capacityValue=totalCapacity maxCapacityValue=totalCapacity warn=leafQueues.firstObject.overCapacity}} +<div class="control-label queue-label">TOTAL</div> +{{capacity-bar capacityValue=totalCapacity maxCapacityValue=totalCapacity warn=leafQueues.firstObject.overCapacity}} </div> <div class="panel-body queues"> {{#each leafQueues}} <div {{bind-attr class=":queue-capacity this.isCurrent:active"}}> <p> - {{this.name}} {{#if isCurrent}} <span class="label label-default">Current</span> {{/if}} + <div class="control-label queue-label">{{this.name}}</div> </p> {{capacity-bar capacityValue=this.capacity maxCapacityValue=this.maximum_capacity warn=this.overCapacity}} {{render "capacityEditForm" this}} @@ -47,13 +47,6 @@ <div {{bind-attr class=":queue-capacity :new-queue this.isCurrent:active"}} > <div class="input-row row" > <div class="col-md-5"> - <div class="input-group"> - {{view view.newQueueNameField value=this.name queue=this placeholder="Enter queue name..."}} - <span class="input-group-btn"> - <button {{action "deleteQueue" this}} {{bind-attr class=":btn :btn-danger"}} type="button">Cancel</button> - <button {{action "createQueue" this}} {{bind-attr class=":btn :btn-default this.isValid::disabled"}} type="button">Create</button> - </span> - </div> {{#each this.errors.path}} <p class="help-block red">{{this.message}}</p> {{/each}} @@ -63,10 +56,5 @@ {{render "capacityEditForm" this}} </div> {{/each}} - {{#if currentQueue.parentPath}} - <div class="queue-capacity" > - <button {{action "addQueue" currentQueue.parentPath}} {{bind-attr class=":btn :btn-default :btn-block hasNew:disabled"}}><i class="fa fa-plus"></i> Add queue</button> - </div> - {{/if}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs index f92eedd..9a99b18 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs @@ -16,17 +16,19 @@ * limitations under the License. }} -<div class="well"> +<div class="well-queue"> <div class="row queue-heading-row"> <div class="col-md-12"> {{#if content.isNew}} <div class="input-group"> - {{focus-input value=content.name class="form-control" classBinding="content.isValid::input-error" action="createQ" revert="delQ" placeholder="Enter queue name..."}} + <h3> + {{focus-input value=content.name length="250" class="form-control" classBinding="content.isValid::input-error" action="createQ" revert="delQ" placeholder="Enter Queue Name"}} <span class="input-group-btn"> <button {{action "delQ" content target="controllers.queues"}} {{bind-attr class=":btn :btn-danger"}} type="button">Cancel</button> - <button {{action "createQ" content target="controllers.queues"}} {{bind-attr class=":btn :btn-default content.isValid::disabled"}} type="button">Create</button> + <button {{action "createQ" content target="controllers.queues"}} {{bind-attr class=":btn :btn-success content.isValid::disabled"}} type="button">Create</button> </span> + </h3> </div> {{else}} {{#unless isRenaming}} @@ -39,17 +41,19 @@ </a> </small> <small> - {{comfirm-delete action="delQ" param=content}} + {{confirm-delete action="delQ" param=content}} </small> {{/unless}} </h3> {{else}} <div class="input-group"> - {{focus-input value=content.name class="form-control" action="renameQ" revert="renameQ" classBinding="content.isValid::input-error" placeholder="Enter queue name..."}} + <h3> + {{focus-input value=content.name length="250" class="form-control" action="renameQ" revert="renameQ" classBinding="content.isValid::input-error" placeholder="Enter Queue Name"}} <span class="input-group-btn"> <button {{action "renameQ" 'cancel'}} {{bind-attr class=":btn :btn-danger"}} type="button">Cancel</button> - <button {{action "renameQ" 'rename'}} {{bind-attr class=":btn :btn-default content.isValid::disabled"}} type="button">Rename</button> + <button {{action "renameQ" 'rename'}} {{bind-attr class=":btn :btn-success content.isValid::disabled"}} type="button">Rename</button> </span> + </h3> </div> {{/unless}} {{/if}} @@ -86,12 +90,12 @@ <div class="panel panel-default panel-capacity"> <div class="panel-heading"> <div class="panel-title"> - Access control + <strong>Access Control</strong> <a href="#" {{action 'toggleEditACL'}} class="text-right"> {{#if isEditACL}} - <small><i class="fa fa-edit"> Hide edit</i> </small> + <div class="edit-link">Hide Edit</div> {{else}} - <small><i class="fa fa-edit">Show edit</i> </small> + <div class="edit-link">Show Edit</div> {{/if}} </a> </div> @@ -101,8 +105,8 @@ {{#if isEditACL}} <div class="form-group row"> - <label class="col-lg-6 col-md-6 col-sm-4 col-xs-5 control-label">Administer Queue ACL</label> - <div class="col-lg-6 col-md-6 col-sm-8 col-xs-7"> + <label class="col-lg-4 col-xs-4 control-label">Administer Queue ACL</label> + <div class="col-lg-6 col-md-6 col-sm-8 col-xs-7 control-value"> <div class="btn-group btn-group-xs" data-toggle="buttons"> {{radio-button label="Anyone" selectionBinding="acl_administer_queue" value="*"}} {{radio-button label="Custom" selectionBinding="acl_administer_queue" value="custom"}} @@ -117,8 +121,8 @@ {{/unless}} <div class="form-group row"> - <label class="col-lg-6 col-md-6 col-sm-4 col-xs-5 control-label">Administer Jobs ACL</label> - <div class="col-lg-6 col-md-6 col-sm-8 col-xs-7"> + <label class="col-lg-4 col-xs-4 control-label">Administer Jobs ACL</label> + <div class="col-lg-6 col-md-6 col-sm-8 col-xs-7 control-value"> <div class="btn-group btn-group-xs" data-toggle="buttons"> {{radio-button label="Anyone" selectionBinding="acl_administer_jobs" value="*"}} {{radio-button label="Custom" selectionBinding="acl_administer_jobs" value="custom"}} @@ -134,8 +138,8 @@ <div class="form-group row"> - <label class="col-lg-6 col-md-6 col-sm-4 col-xs-5 control-label">Submit Applications ACL</label> - <div class="col-lg-6 col-md-6 col-sm-8 col-xs-7"> + <label class="col-lg-4 col-xs-4 control-label">Submit Apps ACL</label> + <div class="col-lg-6 col-md-6 col-sm-8 col-xs-7 control-value"> <div class="btn-group btn-group-xs" data-toggle="buttons"> {{radio-button label="Anyone" selectionBinding="acl_submit_applications" value="*"}} {{radio-button label="Custom" selectionBinding="acl_submit_applications" value="custom"}} @@ -151,8 +155,8 @@ {{else}} <div class="form-group"> - <label class="col-lg-6 col-md-6 col-sm-6 col-xs-6 control-label">Administer Queue ACL</label> - <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> + <label class="col-lg-4 col-xs-4 control-label">Administer Queue ACL</label> + <div class="col-lg-8 col-xs-8 control-value"> <p class="form-control-static"> {{escapeACL content.acl_administer_queue}} </p> @@ -160,8 +164,8 @@ </div> <div class="form-group"> - <label class="col-lg-6 col-md-6 col-sm-6 col-xs-6 control-label">Administer Jobs ACL</label> - <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> + <label class="col-lg-4 col-xs-4 control-label">Administer Jobs ACL</label> + <div class="col-lg-8 col-xs-8 control-value"> <p class="form-control-static"> {{escapeACL content.acl_administer_jobs}} </p> @@ -169,8 +173,8 @@ </div> <div class="form-group"> - <label class="col-lg-6 col-md-6 col-sm-6 col-xs-6 control-label">Submit Applications ACL</label> - <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> + <label class="col-lg-4 col-xs-4 control-label">Submit Apps ACL</label> + <div class="col-lg-8 col-xs-8 control-value"> <p class="form-control-static"> {{escapeACL content.acl_submit_applications}} </p> @@ -186,12 +190,12 @@ <div class="panel panel-default panel-capacity"> <div class="panel-heading"> <div class="panel-title"> - Resource Allocation + <strong>Resource Allocation</strong> <a href="#" {{action 'toggleEditRA'}} class="text-right"> {{#if isEditRA}} - <small><i class="fa fa-edit"> Hide edit</i> </small> + <div class="edit-link">Hide Edit</div> {{else}} - <small><i class="fa fa-edit">Show edit</i> </small> + <div class="edit-link">Show Edit</div> {{/if}} </a> </div> @@ -199,8 +203,8 @@ <div class="panel-body"> <form class="form-horizontal" role="form"> <div class="form-group"> - <label class="col-lg-6 col-md-6 col-sm-6 col-xs-6 control-label">User Limit Factor</label> - <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> + <label class="col-lg-4 col-xs-4 control-label">User Limit Factor</label> + <div class="col-lg-8 col-xs-8 "> {{#if isEditRA}} {{int-input value=content.user_limit_factor class="input-sm"}} {{else}} @@ -209,8 +213,8 @@ </div> </div> <div class="form-group"> - <label class="col-lg-6 col-md-6 col-sm-6 col-xs-6 control-label">Minimum User Limit</label> - <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> + <label class="col-lg-4 col-xs-4 control-label">Minimum User Limit</label> + <div class="col-lg-8 col-xs-8"> {{#if isEditRA}} <div class="input-group"> {{int-input value=content.minimum_user_limit_percent class="input-sm" maxVal=100}} http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queues.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queues.hbs b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queues.hbs index a4f8099..9ad20cb 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queues.hbs +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queues.hbs @@ -25,16 +25,16 @@ </div> {{else}} <div {{bind-attr class=":add-queue needRefresh:col-md-5:col-md-6 :col-sm-6" }} > - <button {{action askPath}} {{bind-attr class=":btn :btn-default :btn-block hasNewQueue:disabled"}} ><i class="fa fa-plus"></i> Add queue</button> + <button {{action askPath}} {{bind-attr class=":btn :btn-default :btn-block hasNewQueue:disabled"}} ><i class="fa fa-plus"></i> Add Queue</button> </div> <div {{bind-attr class=":add-queue needRefresh:col-md-7:col-md-6 :col-sm-6" }} > <div class="btn-group btn-group-justified btn-group-save"> <div class="btn-group"> {{#if needRestart}} - <button {{action saveConfig 'restart'}} {{bind-attr class=":btn :btn-save :btn-success canNotSave:disabled"}} ><i class="fa fa-fw fa fa-cogs"></i> Save and restart</button> + <button {{action saveConfig 'restart'}} {{bind-attr class=":btn :btn-save :btn-success canNotSave:disabled"}} ><i class="fa fa-fw fa fa-cogs"></i> Save and Restart</button> {{else}} {{#if needRefresh}} - <button {{action saveConfig 'refresh'}} {{bind-attr class=":btn :btn-save :btn-success canNotSave:disabled"}} ><i class="fa fa-fw fa-refresh"></i> Save and refresh</button> + <button {{action saveConfig 'refresh'}} {{bind-attr class=":btn :btn-save :btn-success canNotSave:disabled"}} ><i class="fa fa-fw fa-refresh"></i> Save and Refresh</button> {{else}} <button {{action saveConfig}} {{bind-attr class=":btn :btn-save :btn-success canNotSave:disabled"}} ><i class="fa fa-save"></i> Save</button> {{/if}} @@ -45,9 +45,9 @@ <span class="caret"></span> </button> <ul class="dropdown-menu pull-right" role="menu"> - <li><a href="#" {{action saveConfig 'restart'}}><i class="fa fa-fw fa fa-cogs"></i> Save and restart ResourceManager</a></li> - <li><a href="#" {{action saveConfig 'refresh'}}><i class="fa fa-fw fa-refresh"></i> Save and refresh Queues</a></li> - <li><a href="#" {{action saveConfig}}><i class="fa fa-fw fa-save"></i> Save only</a></li> + <li><a href="#" {{action saveConfig 'restart'}}><i class="fa fa-fw fa fa-cogs"></i> Save and Restart ResourceManager</a></li> + <li><a href="#" {{action saveConfig 'refresh'}}><i class="fa fa-fw fa-refresh"></i> Save and Refresh Queues</a></li> + <li><a href="#" {{action saveConfig}}><i class="fa fa-fw fa-save"></i> Save Only</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/schedulerPanel.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/schedulerPanel.hbs b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/schedulerPanel.hbs index d121211..0a52ffa 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/schedulerPanel.hbs +++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/schedulerPanel.hbs @@ -19,12 +19,12 @@ <div class="panel panel-default panel-capacity"> <div class="panel-heading"> <div class="panel-title"> - Scheduler + <strong>Scheduler</strong> <a href="#" {{action 'toggleEditScheduler'}} class="text-right"> {{#if isEditScheduler}} - <small><i class="fa fa-edit"> Hide edit</i> </small> + <div class="edit-link">Hide Edit</div> {{else}} - <small><i class="fa fa-edit"> Show edit</i> </small> + <div class="edit-link">Show Edit</div> {{/if}} </a> </div> @@ -32,8 +32,8 @@ <div class="panel-body"> <form class="form-horizontal" role="form"> <div class="form-group"> - <label class="col-xs-6 col-lg-6 col-md-7 col-sm-6 control-label">Maximum apps</label> - <div class="col-xs-6 col-lg-6 col-md-5 col-sm-6"> + <label class="col-xs-4 control-label">Maximum Apps</label> + <div class="col-xs-8"> {{#if isEditScheduler}} {{int-input value=scheduler.maximum_applications class="input-sm"}} {{else}} @@ -42,8 +42,8 @@ </div> </div> <div class="form-group"> - <label class="col-xs-6 col-lg-6 col-md-7 col-sm-6 control-label">Minimum AM resourse</label> - <div class="col-xs-6 col-lg-6 col-md-5 col-sm-6"> + <label class="col-xs-4 control-label">Minimum AM Resource</label> + <div class="col-xs-8"> {{#if isEditScheduler}} <div class="input-group"> {{int-input value=scheduler.maximum_am_resource_percent class="input-sm" maxVal=100}} http://git-wip-us.apache.org/repos/asf/ambari/blob/ea58eab3/contrib/views/capacity-scheduler/src/main/resources/view.xml ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/view.xml b/contrib/views/capacity-scheduler/src/main/resources/view.xml index 1c2efea..f23dae5 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/view.xml +++ b/contrib/views/capacity-scheduler/src/main/resources/view.xml @@ -21,19 +21,19 @@ <parameter> <name>ambari.server.url</name> - <description>Target Ambari URL</description> + <description>Ambari Server REST API cluster URL (for example: http://ambari.server:8080/api/v1/clusters/c1)</description> <required>true</required> </parameter> <parameter> <name>ambari.server.username</name> - <description>Target Ambari username</description> + <description>Ambari administrator username (for example: admin)</description> <required>true</required> </parameter> <parameter> <name>ambari.server.password</name> - <description>Target Ambari password</description> + <description>Ambari administrator password (for example: admin)</description> <required>true</required> <!-- <hidden>true</hidden> --> </parameter>
