Merge branch 'master' into newmc

Conflicts:
	app.psgi
	tmpl/skel.en

diff --cc js/90-themes.js
index 0bfa8bf839b2cb158da41c426e57fe9e00440538,6afd44448943594cea0a80416b42ea0495e8d420..0b043b8e393adc21146c4a698286f441ea499f98
--- 1/js/90-themes.js
--- 2/js/90-themes.js
+++ b/js/90-themes.js
@@@ -4,19 -4,21 +4,27 @@@
                $('link[rel~="stylesheet"]').prop('disabled', true);
                $('link[title="' + name + '"]').prop('disabled', false);
                localStorage.setItem("theme", name);
 +              $(document).ready(function() {
 +                      if(name == 'slate' || name == 'cyborg')
 +                              $('.logo').removeClass('logo-light');
 +                      else
 +                              $('.logo').addClass('logo-light');
 +              });
        }
  
+       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 --cc tmpl/skel.en
index a6815336cd2d97ca96be7213e75144e5509246a7,22411f95583d5c67a91c5ea2aec31a4021fb40aa..906bbb620b197f680b9b8beca00cf8fd843782ad
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -36,60 -33,8 +36,36 @@@
  
  <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>
 +<a class="logo logo-easyhost" href="http://ro.easyhost.com/"></a>
 +<a class="logo logo-takeofflabs" href="http://www.takeofflabs.com/"></a>
 +<a class="logo logo-bigstep" href="http://www.bigstep.com/"></a>
 +<a class="logo logo-yardi" href="https://www.facebook.com/YardiRomania"></a>
 +<a class="logo logo-bosch" href="http://www.bosch.com.ro/"></a>
 +<a class="logo logo-endava" href="http://www.endava.com/"></a>
 +</div>
 +
  <footer>
 -Dilmom: Why don't you call your product the Gruntmaster 6000?<br>
 -Dilbert: What kind of product do you see when you imagine a Gruntmaster 6000?<br>
 -Dilmom: Well, it's a stripped-down version of the Gruntmaster 9000, of course. But it's software-upgradeable.
 +<div class="row">
 +<div class="col-md-6 column text-center">
 +<a class="logo logo-hermes" href="http://www.societatea-hermes.ro"></a>
 +</div>
 +
 +<div class="col-md-6 column text-center">
 +<a class="logo logo-facebook" href="http://www.facebook.com/mindcodingcluj"></a>
 +</div>
 +</div>
 +
 +<h3>Partners</h3>
 +<a href="https://www.facebook.com/spyhce?fref=ts" class="logo logo-spyhce"></a>
 +<a href="https://www.facebook.com/telenav?fref=ts" class="logo logo-telenav"></a>
 +<h3>Media Partners</h3>
 +<a href="http://cs.ubbcluj.ro" class="logo logo-csf"></a>
 +<a href="http://www.uniunea.ro" class="logo logo-usr"></a>
 +<a href="http://www.coscj.ro" class="logo logo-cos"></a>
 +<a href="http://www.cluj2015.ro/romana" class="logo logo-eyc"></a>
  </footer>