From 9e7a58dcd60a08d17cb326f90dbc810b803e4dbf Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Wed, 18 Sep 2013 22:53:15 +0200
Subject: [PATCH] win8 look and... feel.

---
 univcloud/static/css/style.css              | 29 ++++++++++++++-------
 univcloud/templates/univcloud/base.html     |  1 +
 univcloud/templates/univcloud/homepage.html |  6 ++---
 univcloud/views.py                          | 18 ++++++-------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/univcloud/static/css/style.css b/univcloud/static/css/style.css
index 18c09cb..24423e8 100644
--- a/univcloud/static/css/style.css
+++ b/univcloud/static/css/style.css
@@ -1,17 +1,17 @@
 html, body {
   margin: 0;
   padding: 0;
-  background: #4087b6 url(../img/noise-texture.png);
+  background: #001c3a; /* url(../img/noise-texture.png); */
   height: 101%;
   font-family: 'Merriweather Sans', sans-serif;
-  color: #222;
+  color: #ffffff;
 }
 
 a {
   font-weight: normal;
   text-decoration: none;
   border-bottom: 1px dashed #aaa;
-  color: #3b79a2;
+  color: white;
 }
 
 #footer {
@@ -22,6 +22,7 @@ h1 {
   color: white;
   font-weight: normal;
   padding-left: 10px;
+  padding-top: 20px;
   margin-top: 0;
 }
 
@@ -56,7 +57,7 @@ ul li h2 {
   font-weight: normal;
   font-size: 20px;
   text-decoration: none;
-  color: black;
+  color: white;
   font-weight: normal;
 }
 
@@ -73,21 +74,24 @@ ul li.dark-bg h2 {
 
 #logout {
   position: absolute;
-  right: -5%;
-  top: 0px;
+  right: 0;
+  top: -2px;
   background: white;
   padding: 5px 10px;
-  border-radius: 0 0 5px 5px;
+  border-radius: 0;
+  text-decoration: none;
+  color: black;
+  border: none;
+  display: none;
 }
 
 #portal {
   position: absolute;
-  right: 10px;
+  right: 150px;
   top: -2px;
   background: white;
   padding: 5px 10px;
-  border-radius: 0 0 5px 5px;
-  display: block;
+  border-radius: 0;
   text-decoration: none;
   color: black;
   border: none;
@@ -295,6 +299,11 @@ li.dark-bg:hover .close {
   margin-left: -30px;
 }
 
+#idplist ul li a {
+  color: black;
+  border-bottom: 0;
+}
+
 input#search {
   margin: 10px 10px;
   height: 1.5em;
diff --git a/univcloud/templates/univcloud/base.html b/univcloud/templates/univcloud/base.html
index 17f0060..4238739 100644
--- a/univcloud/templates/univcloud/base.html
+++ b/univcloud/templates/univcloud/base.html
@@ -20,6 +20,7 @@
     <div id="header">
       <h1>Portail des services Univcloud</h1>
       <a href="#" id="portal">Afficher le portail</a>
+      <a href="/accounts/logout" id="logout">Déconnexion</a>
     </div>
     {% endif %}
     <div id="content">
diff --git a/univcloud/templates/univcloud/homepage.html b/univcloud/templates/univcloud/homepage.html
index 580dfc2..05bad1b 100644
--- a/univcloud/templates/univcloud/homepage.html
+++ b/univcloud/templates/univcloud/homepage.html
@@ -19,10 +19,6 @@ UnivCloud
 {% endblock %}
 
 {% block content %}
-<div id="logout">
-<a href="/accounts/logout">Déconnexion</a>
-</div>
-
 <div class="gridster">
 <ul>
 {% for app in apps %}
@@ -88,6 +84,8 @@ var gridster = $(".gridster ul").gridster({
   }
 }).data('gridster');
 
+$('#logout').show('fade');
+
 $('#portal').click(function() {
   $('div.gridster').show('blind', {duration: 800});
   $('.iframe').hide();
diff --git a/univcloud/views.py b/univcloud/views.py
index de7ce1c..9c87903 100644
--- a/univcloud/views.py
+++ b/univcloud/views.py
@@ -45,27 +45,27 @@ class Homepage(TemplateView):
         if reset_layout:
             profile.set_layout({
                 'app001': ('welcome', {'row': 1, 'col': 1,
-                        'background_color': '#ffffcc'}),
+                        'background_color': '#008ba5'}),
                 'app002': ('add', {'row': 1, 'col': 3,
-                        'background_color': '#66ccff'}),
+                        'background_color': '#583ab3'}),
                 'app003': ('weather', {'row': 1, 'col': 4,
-                        'background_color': '#ccffff'}),
+                        'background_color': '#2476eb'}),
                 'app004': ('launcher', {'row': 1, 'col': 5,
                         'label': u'Demandes en ligne',
                         'picto': u'wcs',
-                        'background_color': '#3388cc',
+                        'background_color': '#a500a6',
                         'url': 'http://univcloud.au-quotidien.com'}),
-                'app005': ('help', {'row': 2, 'col': 3}),
+                #'app005': ('help', {'row': 2, 'col': 3}),
                 'app006': ('feed', {'row': 2, 'col': 5,
-                        'background_color': '#cccc99',
+                        'background_color': '#b91b46',
                         'feed_url': 'http://www.etudiant.gouv.fr/rid16/toutes-les-actualites.rss'}),
                 'app007': ('feed', {'row': 3, 'col': 1,
-                        'background_color': '#ccffff',
+                        'background_color': '#583ab3',
                         'feed_url': 'http://www.lemonde.fr/rss/une.xml'}),
-                'app008': ('launcher', {'row': 3, 'col': 3,
+                'app008': ('launcher', {'row': 2, 'col': 3,
                         'label': u'UNPiDF',
                         'picto': u'unpidf',
-                        'background_color': '#11cc11',
+                        'background_color': '#d7562a',
                         'url': 'http://unpidf.univ-paris1.fr'}),
                  })
             profile.save()