You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/05/02 01:31:43 UTC
git commit: AMBARI-5656. Views: do not let the user click on the
Views icon in the top nav. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk bd865da06 -> 548419513
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/54841951
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54841951
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54841951
Branch: refs/heads/trunk
Commit: 548419513dda850e69318d00a2eef85fdebdc872
Parents: bd865da
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu May 1 16:30:49 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu May 1 16:30:49 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/54841951/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/54841951/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}}