]> iEval git - gruntmaster-page.git/commitdiff
Merge branch 'master' into mindcoding
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 11 Feb 2014 07:17:40 +0000 (09:17 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 11 Feb 2014 07:17:40 +0000 (09:17 +0200)
Conflicts:
tmpl/header.en

1  2 
js/90-custom.js
tmpl/header.en

diff --combined js/90-custom.js
index 8b1435d05301d20714ef3f00ea74f6b7384701ef,750aaa101822763bfb7171b430d375e4089640f0..d847fc12092dc8dcd444e7929088dc02993e59e9
@@@ -1,17 -1,8 +1,17 @@@
  (function(){
        'use strict';
        function set_style(name){
-               $('#stylesheet').attr("href", "/css/" + name);
+               $('#stylesheet').attr("href", "/css/" + name + ".css");
                localStorage.setItem("theme", name);
 +              if(name == 'slate' || name == 'cyborg')
 +                      $('.logo').addClass('logo-dark');
 +              else
 +                      $('.logo').removeClass('logo-dark');
 +      }
 +
 +      var theme = localStorage.getItem("theme");
 +      if(theme) {
 +              set_style(theme);
        }
  
        $( document ).ready(function() {
                $('#theme_cerulean').on('click', function () { set_style("cerulean"); });
                $('#theme_cyborg'  ).on('click', function () { set_style("cyborg"); });
                $('#theme_cosmo'   ).on('click', function () { set_style("cosmo"); });
 -      });
  
 -      var theme = localStorage.getItem("theme");
 -      if(theme) {
 -              set_style(theme);
 -      }
 +              if(!$('#sidebar').size()) {
 +                      var content = $('#content');
 +                      content.wrapInner('<div class="col-md-9">').append('<div id="sidebar" class="col-md-3">').addClass('row');
 +              }
 +              $('#sponsors').detach().appendTo($('#sidebar'));
 +
 +              if(theme) set_style(theme);
 +      });
  })();
diff --combined tmpl/header.en
index 2238a38856249e1e2f6dd70a7092020e84bf3335,c4f51f6c9c07e99040daf75ed209e23f28525438..72c4da3dedc95ec2560e0b35459c4b7c5d34dbe7
@@@ -1,17 -1,16 +1,17 @@@
  <!DOCTYPE html>
 -<title>TITLE_GOES_HERE</title>
 +<title>TITLE_GOES_HERE | MindCoding</title>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
- <link rel="stylesheet" href="/css/cosmo" id="stylesheet">
- <script src="/js" type="text/javascript"></script>
 +<link rel="shortcut icon" href="/static/favicon.png">
+ <link rel="stylesheet" href="/css/cyborg.css" id="stylesheet">
+ <script src="/js.js" type="text/javascript"></script>
  
  <nav class="navbar navbar-default navbar-static-top" role="navigation">
  <div class="container-fluid">
  <div class="navbar-header">
  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>
 -<a class="navbar-brand" href="/">Gruntmaster 6000</a>
 +<a class="navbar-brand" href="/"><div class="logo logo-sigla"></div></a>
  </div>
  
  <div class="collapse navbar-collapse">
  <li><a href="/pb/">Problems</a>
  <li><a href="/ct/">Contests</a>
  <li><a href="/account">Account</a>
 +<li><a href="/about">About</a>
  </ul>
  
  <ul class="nav navbar-nav navbar-right">
 +<li><a href="/rules">Rules</a>
  <li><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
  
  <ul class="dropdown-menu" role="menu">
@@@ -41,9 -38,5 +41,9 @@@
  
  <div class="container-fluid">
  
 +<div class="logo logo-mindcoding center-block"></div>
 +
  <h1 id="title">TITLE_GOES_HERE</h1>
  <div id="result"></div>
 +
 +<div id="content">
This page took 0.034225 seconds and 4 git commands to generate.