Merge branch 'master' into mindcoding

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/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