Merge branch 'master' into mindcoding

Conflicts:
	css/custom.css

diff --git a/a/index.en.title b/a/index.en.title
index e7e81c93c088e5d20e78bb5a18f9aadf1e297226..d0fb4fba7b3dd1530bc0f443fbc162f07ef6e629 100644 (file)
--- a/a/index.en.title
+++ b/a/index.en.title
@@ -1 +1 @@
-Gruntmaster 6000
\ No newline at end of file
+MindCoding First Edition
\ No newline at end of file

diff --git a/css/custom.css b/css/custom.css
index bc0b7eaa91f9ec5b0c334935b8dc71b59e85b1d9..4c4ba935ff8caaa82782c707be1fce6e0fa33706 100644 (file)
--- a/css/custom.css
+++ b/css/custom.css
@@ -4,14 +4,6 @@ h1#title{
        font-size: 3em !important;
 }
 
-footer{
-       width: 60em;
-       margin: auto;
-       margin-top: 6em;
-       white-space: pre-wrap;
-       color: #777;
-}
-
 #logo {
        margin: 5em auto 2em;
        display: block;
@@ -48,6 +40,10 @@ div#result{
        text-align: center;
 }
 
+footer{
+       padding: 1.5em 0;
+}
+
 a.dropdown-toggle{
        cursor: pointer;
 }

diff --git a/css/logos.css b/css/logos.css
new file mode 100644 (file)
index 0000000..2ce1c3f
--- /dev/null
+++ b/css/logos.css
@@ -0,0 +1,19 @@
+.logo {
+       background: url("/static/logos.png") no-repeat;
+       display: inline-block;
+       vertical-align: middle;
+}
+
+.logo-clujlife{ background-position: 0 0; width: 60px; height: 53px; }
+.logo-cos{ background-position: -65px 0; width: 212px; height: 53px; }
+.logo-csf{ background-position: -282px 0; width: 220px; height: 120px; }
+.logo-eyc{ background-position: -507px 0; width: 166px; height: 53px; }
+.logo-facebook{ background-position: -678px 0; width: 111px; height: 111px; }
+.logo-hermes{ background-position: -794px 0; width: 200px; height: 111px; }
+.logo-mindcoding{ background-position: -999px 0; width: 600px; height: 93px; display: block; }
+.logo-sigla{ background-position: -1604px 0; width: 29px; height: 31px; }
+.logo-usr{ background-position: -1638px 0; width: 105px; height: 52px; }
+.logo-vinsieu{ background-position: -1748px 0; width: 71px; height: 53px; }
+.logo-welcome2cluj{ background-position: -1824px 0; width: 123px; height: 53px; }
+.logo-yardi{ background-position: -1952px 0; width: 250px; height: 61px; }
+.logo-yardi.logo-dark{ background-position: -2207px 0; width: 250px; height: 61px; }

diff --git a/js/90-custom.js b/js/90-custom.js
index 3759c1b4cfdb14fb75a74426e94ad4b981eaaa91..8b1435d05301d20714ef3f00ea74f6b7384701ef 100644 (file)
--- a/js/90-custom.js
+++ b/js/90-custom.js
@@ -3,6 +3,15 @@
        function set_style(name){
                $('#stylesheet').attr("href", "/css/" + name);
                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() {
@@ -25,10 +34,13 @@
                $('#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 --git a/lib/Gruntmaster/Page/Base.pm b/lib/Gruntmaster/Page/Base.pm
index cf29eacc3c56962148f012739c16bc36b0260aee..8883cade99857c545ceef429a698266598a21bc4 100644 (file)
--- a/lib/Gruntmaster/Page/Base.pm
+++ b/lib/Gruntmaster/Page/Base.pm
@@ -44,18 +44,19 @@ sub import {
 my %orig_header_templates = (
   en => <<'HTML',
 <!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/cyborg" id="stylesheet">
+<link rel="shortcut icon" href="/static/favicon.png">
+<link rel="stylesheet" href="/css/cosmo" id="stylesheet">
 <script src="/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">
@@ -83,19 +84,47 @@ my %orig_header_templates = (
 
 <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">
 HTML
 );
 
 my %orig_footer_templates = (
   en => <<'HTML',
 
+</div>
+
+<div id="sponsors">
+<h3>Official sponsors</h3>
+<div class="logo logo-yardi"></div>
+</div>
+
 <footer>
-Dilmom: Why don't you call your product the Gruntmaster 6000?
-Dilbert: What kind of product do you see when you imagine a Gruntmaster 6000?
-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="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>
+<h3> Media Partners </h3>
+<a href="http://www.clujlife.com" class="logo logo-clujlife"></a>
+<a href="http://www.vinsieu.ro/eveniment/cluj/cluj-napoca/alte-evenimente/mindcoding/88970/e.html" class="logo logo-vinsieu"></a>
+<a href="http://www.welcome2cluj.com" class="logo logo-welcome2cluj"></a>
 </footer>
+</div>
 HTML
 );
 

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 2672769a5a167d7423b313cb9cc831d7e3301edb..771808b7b022a47d7a6a53af924294a20a191325 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -15,6 +15,9 @@ use constant TEMPLATES => {
 </div>
 
 <div class="col-md-3">
+<div id="sidebar"></div>
+
+<h3>Problem information</h3>
 <dl>
 <dt>Author</dt> <dd><tmpl_var author></dd>
 <dt>Owner</dt> <dd><tmpl_var owner></dd>

diff --git a/run b/run
index e56ffc2507a43551a7f5dacb29b22cb36cf6ecbf..46b9bcb1a20cd0a3ebf901e6bc77593ec59d74a6 100755 (executable)
--- a/run
+++ b/run
@@ -1,2 +1,2 @@
 #!/bin/bash
-PURGE_HOST=ngm.ieval.ro AAP_ROOTDIR=/var/www/auth/us plackup -s Starlet -Ilib -R . -p 8081
+PURGE_HOST=new.mindcoding.ro AAP_ROOTDIR=/var/www/auth/us plackup -s Starlet -Ilib -R . -p 8082

diff --git a/static/favicon.png b/static/favicon.png
new file mode 100644 (file)
index 0000000..b7df921
Binary files /dev/null and b/static/favicon.png differ

diff --git a/static/logos.png b/static/logos.png
new file mode 100644 (file)
index 0000000..0a6ee71
Binary files /dev/null and b/static/logos.png differ