Updated Branches: refs/heads/trunk cf593abc2 -> 788eedb09
AMBARI-2933. Incorrect displaying of "Summary" panel for service page in IE9. (onechiporenko via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/788eedb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/788eedb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/788eedb0 Branch: refs/heads/trunk Commit: 788eedb090fe43b88dfabff0881ad42b59411025 Parents: cf593ab Author: Yusaku Sako <[email protected]> Authored: Fri Aug 16 10:54:54 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Fri Aug 16 10:54:54 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 4 + .../app/templates/main/service/info/summary.hbs | 207 +++++++++---------- 2 files changed, 105 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/788eedb0/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 67be4f2..e65c9da 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -1936,6 +1936,10 @@ width:100%; .nav-pills.move { float: right; margin-top: -48px; + width:105px; + &>li { + position: absolute; + } } .service-content { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/788eedb0/ambari-web/app/templates/main/service/info/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs index 7abf983..c77492e 100644 --- a/ambari-web/app/templates/main/service/info/summary.hbs +++ b/ambari-web/app/templates/main/service/info/summary.hbs @@ -17,117 +17,112 @@ }} <div class="row-fluid service-block"> -<div class="span6"> -{{#if view.service.quickLinks.length}} -{{#view App.QuickViewLinks contentBinding="view.service"}} -<ul class="nav nav-pills move"> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{t common.quickLinks}}<b class="caret"></b></a> - <ul class="dropdown-menu"> - {{#each view.quickLinks}} - <a {{bindAttr href="url"}} {{bindAttr target="view.linkTarget"}}>{{label}}</a> - {{/each}} - </ul> - </li> -</ul> -{{/view}} -{{/if}} + <div class="span6"> + {{#if view.service.quickLinks.length}} + {{#view App.QuickViewLinks contentBinding="view.service"}} + <ul class="nav nav-pills move"> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{t common.quickLinks}}<b class="caret"></b></a> + <ul class="dropdown-menu"> + {{#each view.quickLinks}} + <a {{bindAttr href="url"}} {{bindAttr target="view.linkTarget"}}>{{label}}</a> + {{/each}} + </ul> + </li> + </ul> + {{/view}} + {{/if}} -<div class="box"> - <div class="box-header"> - <h4>{{controller.content.label}} {{t services.service.info.menu.summary}}</h4> - </div> - <div class="service-content"> - <table id="summary-info" class="table no-borders table-condensed"> - <tbody> - {{#if view.noTemplateService}} - {{#each component in view.components}} - {{#if component.isMaster}} - {{view view.sumMasterComponentView}} - {{else}} - <tr> - <td class="summary-label">{{component.displayName}}{{#if view.hasManyClients}}s{{/if}}</td> - <td> - <span class="green-live">{{view.clients.length}}</span> - {{component.displayName}} {{#if view.hasManyClients}}s{{/if}} {{t common.installed}} - <div class="summary-view-host"> - <a {{action filterHosts component}} href="javascript:void(null)>{{view.clientsHostText}}</a> - </div> - </td> - </tr> + <div class="box"> + <div class="box-header"> + <h4>{{controller.content.label}} {{t services.service.info.menu.summary}}</h4> + </div> + <div class="service-content"> + <table id="summary-info" class="table no-borders table-condensed"> + <tbody> + {{#if view.noTemplateService}} + {{#each component in view.components}} + {{#if component.isMaster}} + {{view view.sumMasterComponentView}} + {{else}} + <tr> + <td class="summary-label">{{component.displayName}}{{#if view.hasManyClients}}s{{/if}}</td> + <td> + <span class="green-live">{{view.clients.length}}</span> + {{component.displayName}} {{#if view.hasManyClients}}s{{/if}} {{t common.installed}} + <div class="summary-view-host"> + <a {{action filterHosts component}} href="javascript:void(null)>{{view.clientsHostText}}</a> + </div> + </td> + </tr> + {{/if}} + {{/each}} + {{/if}} + {{#if view.serviceStatus.hdfs}} + {{view App.MainDashboardServiceHdfsView showOnlyRows=true serviceBinding="view.service"}} + {{/if}} + {{#if view.serviceStatus.mapreduce}} + {{view App.MainDashboardServiceMapreduceView showOnlyRows=true serviceBinding="view.service"}} {{/if}} + {{#if view.serviceStatus.yarn}} + {{view App.MainDashboardServiceYARNView showOnlyRows=true serviceBinding="view.service"}} + {{/if}} + {{#if view.serviceStatus.mapreduce2}} + {{template "templates/main/service/info/summary/mapreduce2"}} + {{/if}} + {{#if view.serviceStatus.hbase}} + {{view App.MainDashboardServiceHbaseView showOnlyRows=true serviceBinding="view.service"}} + {{/if}} + {{#if view.serviceStatus.zookeeper}} + {{template "templates/main/service/info/summary/zookeeper"}} + {{/if}} + {{#if view.serviceStatus.oozie}} + {{template "templates/main/service/info/summary/oozie"}} + {{/if}} + {{#if view.serviceStatus.ganglia}} + {{template "templates/main/service/info/summary/ganglia"}} + {{/if}} + {{#if view.serviceStatus.hive}} + {{template "templates/main/service/info/summary/hive"}} + {{/if}} + {{#if view.serviceStatus.hue}} + {{template "templates/main/service/info/summary/hue"}} + {{/if}} + {{#if view.serviceStatus.flume}} + {{view App.MainDashboardServiceFlumeView showOnlyRows=true serviceBinding="view.service"}} + {{/if}} + </tbody> + </table> + </div> + </div> + </div> + <div class="span6"> + <div class="box"> + <div class="box-header"> + <h4>{{t services.alerts.headingOfList}}</h4> + <div class="btn-group"> + <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a> + </div> + </div> + <ul id='summary-alerts-list' class="alerts"> + {{#if controller.alerts.length}} + {{#each controller.alerts}} + {{view App.AlertItemView contentBinding="this"}} {{/each}} + {{else}} + {{#if controller.isNagiosInstalled}} + <div class="alert alert-info"> + {{t services.service.info.summary.nagios.noAlerts}} + </div> + {{else}} + <div class="alert"> + {{t services.service.info.summary.nagios.alerts}} + </div> + {{/if}} {{/if}} - {{#if view.serviceStatus.hdfs}} - {{view App.MainDashboardServiceHdfsView showOnlyRows=true serviceBinding="view.service"}} - {{/if}} - {{#if view.serviceStatus.mapreduce}} - {{view App.MainDashboardServiceMapreduceView showOnlyRows=true serviceBinding="view.service"}} - {{/if}} - {{#if view.serviceStatus.yarn}} - {{view App.MainDashboardServiceYARNView showOnlyRows=true serviceBinding="view.service"}} - {{/if}} - {{#if view.serviceStatus.mapreduce2}} - {{template "templates/main/service/info/summary/mapreduce2"}} - {{/if}} - {{#if view.serviceStatus.hbase}} - {{view App.MainDashboardServiceHbaseView showOnlyRows=true serviceBinding="view.service"}} - {{/if}} - {{#if view.serviceStatus.zookeeper}} - {{template "templates/main/service/info/summary/zookeeper"}} - {{/if}} - {{#if view.serviceStatus.oozie}} - {{template "templates/main/service/info/summary/oozie"}} - {{/if}} - {{#if view.serviceStatus.ganglia}} - {{template "templates/main/service/info/summary/ganglia"}} - {{/if}} - {{#if view.serviceStatus.hive}} - {{template "templates/main/service/info/summary/hive"}} - {{/if}} - {{#if view.serviceStatus.hue}} - {{template "templates/main/service/info/summary/hue"}} - {{/if}} - {{#if view.serviceStatus.flume}} - {{view App.MainDashboardServiceFlumeView showOnlyRows=true serviceBinding="view.service"}} - {{/if}} - </tbody> - </table> - {{!view view.moreStatsView}} + </ul> + </div> </div> - {{! - <div class="box-footer"> - </div> - }} -</div> -</div> -<div class="span6"> - <div class="box"> - <div class="box-header"> - <h4>{{t services.alerts.headingOfList}}</h4> - <div class="btn-group"> - <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a> - </div> - </div> - <ul id='summary-alerts-list' class="alerts"> - {{#if controller.alerts.length}} - {{#each controller.alerts}} - {{view App.AlertItemView contentBinding="this"}} - {{/each}} - {{else}} - {{#if controller.isNagiosInstalled}} - <div class="alert alert-info"> - {{t services.service.info.summary.nagios.noAlerts}} - </div> - {{else}} - <div class="alert"> - {{t services.service.info.summary.nagios.alerts}} - </div> - {{/if}} - {{/if}} - </ul> - </div> -</div> </div> {{#if view.serviceMetricGraphs.length}} <div class="row-fluid">
