From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 28 Feb 2015 14:33:39 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=44397e8ab2732248e68f08ba72172b7055492a44;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

44397e8ab2732248e68f08ba72172b7055492a44
diff --cc tmpl/skel.en
index c28e1f7,8987da7..b1f5a2d
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -16,15 -16,7 +16,8 @@@
  <li id="nav-log"><a href="/log/">Job log</a>
  <li id="nav-us"><a href="/us/">Users</a>
  <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>
@@@ -39,19 -30,20 +32,21 @@@
  <div id="content">Content goes here</div>
  
  <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>