From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 3 Apr 2015 08:22:08 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=1964c8579557d5244f9032ce36bd02e02661709f;hp=bc188d0bb1aa436df1261a7840c2c6834d1def71;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	app.psgi
	tmpl/skel.en
---

diff --git a/js/90-themes.js b/js/90-themes.js
index 0bfa8bf..0b043b8 100644
--- a/js/90-themes.js
+++ b/js/90-themes.js
@@ -12,11 +12,19 @@
 		});
 	}
 
+	var selector;
+
+	function add_themelink(theme, text) {
+		var link = $('<a role="button">' + text + '</a>');
+		link.appendTo(selector.find('ul')).wrap('<li>').on('click', function () { set_style(theme) });
+	}
+
 	$( document ).ready(function() {
-		$('#theme-selector').detach().prependTo($('#sidebar'));
-		$('#theme_slate'   ).on('click', function () { set_style("slate"); });
-		$('#theme_cyborg'  ).on('click', function () { set_style("cyborg"); });
-		$('#theme_readable').on('click', function () { set_style("readable"); });
+		selector = $('<div>Themes: <ul class="list-inline"></ul></div>');
+		add_themelink('cyborg', 'Black');
+		add_themelink('slate', 'Grey');
+		add_themelink('readable', 'White');
+		$('#sidebar').prepend(selector);
 	});
 
 	var theme = localStorage.getItem("theme");
diff --git a/js/90-tracker.js b/js/90-tracker.js
index 50ba7d4..1fa4905 100644
--- a/js/90-tracker.js
+++ b/js/90-tracker.js
@@ -9,6 +9,8 @@
 		$('.tracker-info').removeClass('tracker-info info');
 	}
 
+	var tracker;
+
 	function update_tracker(){
 		var data = localStorage.getItem('tracker_data');
 		var user = localStorage.getItem('tracker_username');
@@ -74,7 +76,7 @@
 	function start_tracking(user){
 		localStorage.setItem('tracker_username', user);
 		$('#tracker_userlink').attr('href', '/us/' + user).html(user);
-		$('#tracker_tracking').removeClass('hidden');
+		tracker.removeClass('hidden');
 		update_tracker();
 		var lastfetch = localStorage.getItem('tracker_lastfetch');
 		if(Date.now() - lastfetch > 60 * 10 * 1000)
@@ -100,11 +102,12 @@
 		localStorage.removeItem('tracker_username');
 		localStorage.removeItem('tracker_data');
 		localStorage.removeItem('tracker_lastfetch');
-		$('#tracker_tracking').addClass('hidden');
+		tracker.addClass('hidden');
 	}
 
 	$( document ).ready(function(){
-		$('#tracker').detach().prependTo($('#sidebar'));
+		tracker = $('<div id="tracker" class="hidden">Tracking <a id="tracker_userlink"></a>.<br><a id="tracker_stop" role="button">Stop tracking</a><br><a id="tracker_log">Job log</a><dl class="dl-horizontal"><dt>Solved</dt>    <dd id="tracker_solved">?</dd><dt>Attempted</dt> <dd id="tracker_attempted">?</dd><dt>Contests</dt>  <dd id="tracker_contests">?</dd></dl></div>');
+		tracker.prependTo($('#sidebar'));
 		$('#tracker_stop').on('click', stop_tracking);
 		$('#track_user').on('click', function() { stop_tracking(); start_tracking($(this).data('user')) });
 		$('#submitform').on('submit', function() { localStorage.removeItem('tracker_lastfetch') });
diff --git a/js/95-login.js b/js/95-login.js
index 60ede9d..7f52deb 100644
--- a/js/95-login.js
+++ b/js/95-login.js
@@ -2,7 +2,7 @@
 	'use strict';
 
 	$( document ).ready(function(){
-		$('#login').detach().prependTo($('#sidebar')).on('click', function(e) {
+		$('<a role="button">Log in').prependTo($('#sidebar')).wrap('<div id="login">').on('click', function(e) {
 			var xhr = new XMLHttpRequest();
 			xhr.open('GET', '/login');
 			xhr.onload = function () {
diff --git a/tmpl/skel.en b/tmpl/skel.en
index a681533..906bbb6 100644
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -36,32 +36,8 @@
 
 <div id="content">Content goes here</div>
 
-<div id="login" class="reqjs" static="no"><a href="#">Log in</a></div>
 <div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
 
-<div id="theme-selector" class="reqjs">
-Themes:
-<ul class="list-inline">
-<li><a href="#" id="theme_cyborg">Black</a>
-<li><a href="#" id="theme_slate">Gray</a>
-<li><a href="#" id="theme_readable">White</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>
-<dl class="dl-horizontal">
-<dt>Solved</dt>    <dd id="tracker_solved">?</dd>
-<dt>Attempted</dt> <dd id="tracker_attempted">?</dd>
-<dt>Contests</dt>  <dd id="tracker_contests">?</dd>
-</dl>
-</div>
-</div>
-
 <div id="sponsors">
 <h3>Official sponsors</h3>
 <a class="logo logo-emag" href="http://www.fundatiaemag.ro/"></a>