Repository: ambari Updated Branches: refs/heads/trunk b2740331a -> 147955bb3
AMBARI-7904. Flume agent button is hidden. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/147955bb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/147955bb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/147955bb Branch: refs/heads/trunk Commit: 147955bb3be297ecbb1665cff45cb75e97d05420 Parents: b274033 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Wed Oct 22 18:08:21 2014 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Wed Oct 22 18:34:07 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 6 ++- .../templates/main/service/services/flume.hbs | 46 +++++++++++--------- 2 files changed, 30 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/147955bb/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 4847eaa..5c64bb2 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -6982,9 +6982,13 @@ i.icon-asterisks { .wrapp-flume-status{ text-align: left; } - .flume-agents-actions { + .btn-wrapper { margin: 0 5px 5px 0; float: right; + width:60px; + } + .flume-agents-actions { + position: absolute; a { text-decoration: none; } http://git-wip-us.apache.org/repos/asf/ambari/blob/147955bb/ambari-web/app/templates/main/service/services/flume.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/flume.hbs b/ambari-web/app/templates/main/service/services/flume.hbs index ecbbf46..5bdf242 100644 --- a/ambari-web/app/templates/main/service/services/flume.hbs +++ b/ambari-web/app/templates/main/service/services/flume.hbs @@ -42,26 +42,28 @@ </td> <td class="agent-status"> <div class="wrapp-flume-status"> - <span {{bindAttr class="host.firtstAgent.healthClass"}}></span> {{host.firtstAgent.name}} - <div class="btn-group display-inline-block flume-agents-actions"> - <a {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown" href="javascript:void(null)">{{host.firtstAgent.displayStatus}} - <span class="caret"></span> - </a> - <ul class="pull-left dropdown-menu"> - <li {{bindAttr class="host.firtstAgent.isStartAgentDisabled:disabled"}}> - <a href="javascript:void(null)" - {{bindAttr class="host.firtstAgent.isStartAgentDisabled:disabled"}} - {{action startFlumeAgent host.firtstAgent target="controller"}}> - {{t services.service.summary.flume.startAgent}}</a> - </li> - <li {{bindAttr class="host.firtstAgent.isStopAgentDisabled:disabled"}}> - <a href="javascript:void(null)" - {{bindAttr class="host.firtstAgent.isStopAgentDisabled:disabled"}} - {{action stopFlumeAgent host.firtstAgent target="controller"}}> - {{t services.service.summary.flume.stopAgent}}</a> - </li> - </ul> - </div> + <div class="pull-left"><span {{bindAttr class="host.firtstAgent.healthClass"}}></span> {{host.firtstAgent.name}}</div> + <div class="btn-wrapper"> + <div class="btn-group display-inline-block flume-agents-actions"> + <a {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown" href="javascript:void(null)">{{host.firtstAgent.displayStatus}} + <span class="caret"></span> + </a> + <ul class="pull-left dropdown-menu"> + <li {{bindAttr class="host.firtstAgent.isStartAgentDisabled:disabled"}}> + <a href="javascript:void(null)" + {{bindAttr class="host.firtstAgent.isStartAgentDisabled:disabled"}} + {{action startFlumeAgent host.firtstAgent target="controller"}}> + {{t services.service.summary.flume.startAgent}}</a> + </li> + <li {{bindAttr class="host.firtstAgent.isStopAgentDisabled:disabled"}}> + <a href="javascript:void(null)" + {{bindAttr class="host.firtstAgent.isStopAgentDisabled:disabled"}} + {{action stopFlumeAgent host.firtstAgent target="controller"}}> + {{t services.service.summary.flume.stopAgent}}</a> + </li> + </ul> + </div> + </div> </div> </td> <td> @@ -78,7 +80,8 @@ {{#view view.agentView contentBinding="host"}} <td class="agent-status"> <div class="wrapp-flume-status"> - <span {{bindAttr class="agent.healthClass"}}></span> {{agent.name}} + <div class="pull-left"><span {{bindAttr class="agent.healthClass"}}></span> {{agent.name}}</div> + <div class="btn-wrapper"> <div class="btn-group display-inline-block flume-agents-actions"> <a {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown" href="javascript:void(null)">{{agent.displayStatus}} <span class="caret"></span> @@ -97,6 +100,7 @@ {{t services.service.summary.flume.stopAgent}}</a> </li> </ul> + </div> </div> </div> </td>
