Merge branch 'master' into newmc

[gruntmaster-page.git] / tmpl / skel.en

diff --git a/tmpl/skel.en b/tmpl/skel.en
index c28e1f761603f7cbb6e1fa7aa154862e9d7156e1..b1f5a2dc73dfda05473547fffd364c84a0dd2e25 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -18,13 +18,6 @@
 <li id="nav-account"><a href="/account">Account</a>
 <li id="nav-about"><a href="/about">About / Help</a>
 <li id="nav-contribute"><a href="/contribute">Contribute!</a>
-<li id="theme-selector" class="reqjs"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
-<ul class="dropdown-menu" role="menu">
-<li><a href="#" id="theme_slate">Gunmetal gray</a>
-<li><a href="#" id="theme_cyborg">Black</a>
-<li><a href="#" id="theme_cerulean">White</a>
-<li><a href="#" id="theme_cosmo">Metro</a>
-</ul>
 
 </ul>
 </div>
@@ -41,17 +34,19 @@
 <div id="login" class="reqjs"><a href="/login">Log in</a></div>
 <div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
 
-<div id="tracker" class="reqjs">
-<h3>Track user</h3>
-<div id="tracker_form">
-<div class="form-group">
-<label for="tracker_username">Username</label>
-<input type="text" id="tracker_username" class="form-control">
-</div>
-<button id="tracker_button" class="btn btn-default">Start tracking</button>
+<div id="theme-selector" class="reqjs">
+Themes:
+<ul class="list-inline">
+<li><a href="#" id="theme_slate">Gray</a>
+<li><a href="#" id="theme_cyborg">Black</a>
+<li><a href="#" id="theme_cerulean">White</a>
+<li><a href="#" id="theme_cosmo">Metro</a>
+</ul>
 </div>
 
+<div id="tracker" class="reqjs">
 <div id="tracker_tracking" class="hidden">
+<br>
 Tracking <a href="#" id="tracker_userlink"></a>.<br>
 <a href="#" id="tracker_stop">Stop tracking</a><br>
 <a href="#" id="tracker_log">Job log</a>