]> iEval git - gruntmaster-page.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
1  2 
js/90-themes.js
tmpl/skel.en

diff --combined js/90-themes.js
index c868cbd86239ed6cb1cff42fe60f9e5f55a3fb11,caefa395a0bc7ce4edf0e05e49361494ba8ee103..3c5d5c57b5f82db72b7b5310ae10d8560dfaa164
@@@ -1,26 -1,21 +1,27 @@@
  (function(){
        'use strict';
        function set_style(name){
 -              $('#stylesheet').attr("href", "/css/" + name + ".css");
 +              $('#stylesheet').attr("href", "https://static.mindcoding.ro/css/" + name + ".css");
                localStorage.setItem("theme", name);
 +              $(document).ready(function() {
 +                      if(name == 'slate' || name == 'cyborg')
 +                              $('.logo').removeClass('logo-light');
 +                      else
 +                              $('.logo').addClass('logo-light');
 +              });
        }
  
        $( document ).ready(function() {
                $('#theme-selector').detach().prependTo($('#sidebar'));
                $('#theme_slate'   ).on('click', function () { set_style("slate"); });
-               $('#theme_cerulean').on('click', function () { set_style("cerulean"); });
                $('#theme_cyborg'  ).on('click', function () { set_style("cyborg"); });
-               $('#theme_cosmo'   ).on('click', function () { set_style("cosmo"); });
+               $('#theme_readable').on('click', function () { set_style("readable"); });
        });
  
        var theme = localStorage.getItem("theme");
        if(theme) {
+               if(theme == "cerulean" || theme == "cosmo")
+                       theme = "readable";
                set_style(theme);
        }
  })();
diff --combined tmpl/skel.en
index b1f5a2dc73dfda05473547fffd364c84a0dd2e25,fd549a17bc6a83166ba8cbcf42c5e9a39ad6e8cf..17804ad0eff9098e9c8eb205c8e97008c476a84b
@@@ -3,20 -3,19 +3,20 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
 -<link rel="stylesheet" href="/css/cyborg.css" id="stylesheet">
 -<script src="/js.js" type="text/javascript" async defer></script>
 +<link rel="stylesheet" href="https://static.mindcoding.ro/css/slate.css" id="stylesheet">
 +<script src="https://static.mindcoding.ro/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 -23,6 +24,7 @@@
  </nav>
  
  <div class="container-fluid">
 +<div id="logo"></div>
  
  <h1 id="title">TITLE</h1>
  <div id="result"></div>
  <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:
  <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>
+ <li><a href="#" id="theme_slate">Gray</a>
+ <li><a href="#" id="theme_readable">White</a>
  </ul>
  </div>
  
@@@ -58,34 -54,8 +57,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.030107 seconds and 4 git commands to generate.