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

diff --combined js/90-themes.js
index 45bd63cfa8ed4db05e333c81391858e986f613ad,eb5987c76041a5d720bc9787302c3120122ccc42..c868cbd86239ed6cb1cff42fe60f9e5f55a3fb11
@@@ -1,17 -1,12 +1,18 @@@
  (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"); });
diff --combined tmpl/skel.en
index c28e1f761603f7cbb6e1fa7aa154862e9d7156e1,8987da72d028c23cbfda68a61793603bd1b649f5..b1f5a2dc73dfda05473547fffd364c84a0dd2e25
@@@ -3,35 -3,26 +3,28 @@@
  <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>
- <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>
  </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="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>
  </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.025239 seconds and 4 git commands to generate.