ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-5656. Views: do not let the user click on the Views icon in the top nav. (xiwang via yusaku)
Date Thu, 01 May 2014 23:34:08 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0 ecea19ada -> d55c38d3a


AMBARI-5656. Views: do not let the user click on the Views icon in the top nav. (xiwang via
yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d55c38d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d55c38d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d55c38d3

Branch: refs/heads/branch-1.6.0
Commit: d55c38d3a9888dab0162fdf321ea9d8fb803f79c
Parents: ecea19a
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Thu May 1 16:30:49 2014 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Thu May 1 16:32:23 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/styles/application.less      |  1 -
 ambari-web/app/templates/main/menu_item.hbs | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d55c38d3/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index fe66e1c..5093cdd 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -232,7 +232,6 @@ footer {
       }
       .top-nav-dropdown:hover .top-nav-dropdown-menu {
         display: block;
-
       }
       .top-nav-dropdown-menu {
         display: none;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d55c38d3/ambari-web/app/templates/main/menu_item.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/menu_item.hbs b/ambari-web/app/templates/main/menu_item.hbs
index 9581512..4c927bc 100644
--- a/ambari-web/app/templates/main/menu_item.hbs
+++ b/ambari-web/app/templates/main/menu_item.hbs
@@ -15,14 +15,22 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-<a href="#/main/{{unbound view.content.routing}}">
-  {{{unbound view.content.label}}}
-  {{#if view.alertsCount}}
+
+{{#if view.content.isView}}
+  <a href="javascript:void(null);">
+    {{{unbound view.content.label}}}
+  </a>
+{{else}}
+  <a href="#/main/{{unbound view.content.routing}}">
+    {{{unbound view.content.label}}}
+    {{#if view.alertsCount}}
       <span class="label label-important alerts-count">
         {{view.alertsCount}}
       </span>
-  {{/if}}
-</a>
+    {{/if}}
+  </a>
+{{/if}}
+
 <!--dropdown menu for the items had dropdowns-->
 {{#if view.isServicesItem}}
   {{view App.TopNavServiceMenuView}}


Mime
View raw message