]> iEval git - gruntmaster-page.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 10 Mar 2015 19:15:34 +0000 (21:15 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 10 Mar 2015 19:15:34 +0000 (21:15 +0200)
Conflicts:
js/90-themes.js
tmpl/skel.en

1  2 
js/90-themes.js
tmpl/skel.en

diff --combined js/90-themes.js
index b7d73221bc1a255a63c1f6570a0e1fd9ecc0d045,7221ddeac3eb40f7ea1e22255aa5ead6ed84d872..0bfa8bf839b2cb158da41c426e57fe9e00440538
@@@ -1,14 -1,9 +1,15 @@@
  (function(){
        'use strict';
        function set_style(name){
-               $('#stylesheet').attr("href", "https://static.mindcoding.ro/static/css/" + name + ".css");
+               $('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');
 +              });
        }
  
        $( document ).ready(function() {
diff --combined tmpl/skel.en
index 610e9b723dddb524b9563fb1b9dea933d3eb0eae,b713e0e2ec927d4e0eedc70abd530935fb43a382..26d074ebc4dd116a7f811941cb380779c5285db5
@@@ -3,20 -3,21 +3,22 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
- <link rel="stylesheet" href="https://static.mindcoding.ro/static/css/slate.css" id="stylesheet">
 -<link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet">
 -<link href="/static/css/slate.css" title="slate" rel="alternate stylesheet">
 -<link href="/static/css/readable.css" title="readable" rel="alternate stylesheet">
 -<script src="/static/js.js" type="text/javascript" async defer></script>
++<link href="https://static.mindcoding.ro/static/css/cyborg.css" title="cyborg" rel="alternate  stylesheet">
++<link href="https://static.mindcoding.ro/static/css/slate.css" title="slate" rel="stylesheet">
++<link href="https://static.mindcoding.ro/static/css/readable.css" title="readable" rel="alternate stylesheet">
 +<script src="https://static.mindcoding.ro/static/js.js" type="text/javascript" async defer></script>
  
  <body>
  <nav role="navigation">
  <div class="container-fluid">
  <ul class="nav nav-pills nav-justified">
 -<li id="nav-home"><a href="/">Gruntmaster 6000</a>
 +<li id="nav-home"><a href="/">Home</a>
  <li id="nav-pb"><a href="/pb/">Problems</a>
  <li id="nav-ct"><a href="/ct/">Contests</a>
  <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>
  
  </ul>
@@@ -24,7 -25,6 +26,7 @@@
  </nav>
  
  <div class="container-fluid">
 +<div id="logo"></div>
  
  <h1 id="title">TITLE</h1>
  <div id="result"></div>
@@@ -32,7 -32,6 +34,7 @@@
  <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="theme-selector" class="reqjs">
  Themes:
@@@ -57,34 -56,8 +59,34 @@@ Tracking <a href="#" id="tracker_userli
  </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>
This page took 0.030267 seconds and 4 git commands to generate.