You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/07/18 21:32:04 UTC
[2/3] git commit: Fixed a WebUI navbar regression.
Fixed a WebUI navbar regression.
The navbar collapsing stopped working when Bootstrap JS was replaced
with Angular UI. It should now use the "Collapse" directive that is
part of Angular UI.
From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12610
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/53e5f334
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/53e5f334
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/53e5f334
Branch: refs/heads/master
Commit: 53e5f33475aec727adca54f02f444ccab929125e
Parents: 0a90c80
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Jul 18 11:46:19 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jul 18 11:46:19 2013 -0700
----------------------------------------------------------------------
src/webui/master/static/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/53e5f334/src/webui/master/static/index.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/index.html b/src/webui/master/static/index.html
index 0a9c52f..a14e813 100644
--- a/src/webui/master/static/index.html
+++ b/src/webui/master/static/index.html
@@ -30,13 +30,13 @@
<div class="navbar navbar-inverse navbar-fixed-top" id="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <a class="btn btn-navbar" data-ng-click="navbarExpanded = !navbarExpanded">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Mesos</a>
- <div class="nav-collapse">
+ <div class="nav-collapse" data-collapse="!navbarExpanded">
<ul class="nav">
<li data-tabname="dashboard"><a href="#/dashboard">Dashboard</a></li>
<li data-tabname="frameworks"><a href="#/frameworks">Frameworks</a></li>