From cfe9e69002613b5d52f6db6c7e1ae3767eb9f7dc Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Thu, 29 Dec 2011 11:07:20 +0000 Subject: [PATCH] =?UTF-8?q?Modification=20style=20et=20affichage=20ainsi?= =?UTF-8?q?=20que=20fonctionnement=20du=20script=20de=20mise=20=C3=A0=20jo?= =?UTF-8?q?ur=20du=20comptage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/default/scripts/header.phtml | 26 ++++++++++++------- public/themes/default/scripts/scripts.js | 13 +++++----- public/themes/default/styles/main.css | 10 +++++-- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/application/views/default/scripts/header.phtml b/application/views/default/scripts/header.phtml index 3812e8a9..f0f2e048 100644 --- a/application/views/default/scripts/header.phtml +++ b/application/views/default/scripts/header.phtml @@ -4,6 +4,7 @@
  • Tableau de bord
  • Aide
  • A propos de
  • +
  • Déconnexion
  • @@ -11,16 +12,21 @@

    Odea

    -
    -
    - Nombre sélectionnées : - total))?$this->total:'-');?> - (dont insee))?$this->insee:'-');?> unité(s) insee) -
    - +
    +
    + total)) {?> + Nombre sélectionnées : + total?> + (dont insee?> unité(s) insee) + + Aucune sélection. + +
    +
    + + \ No newline at end of file diff --git a/public/themes/default/scripts/scripts.js b/public/themes/default/scripts/scripts.js index e5e75378..5c69acd5 100644 --- a/public/themes/default/scripts/scripts.js +++ b/public/themes/default/scripts/scripts.js @@ -142,13 +142,14 @@ $(document).ready(function(){ function set(key, value) { - $('.comptage').css('display', 'none'); - $('.attente').css('display', 'block'); + $('#comptage').css('display', 'none'); + $('#attente').css('display', 'block'); $.post('/comptage', { cle:key, valeur:value}, function(data, status) { - $('#count').html(data.count); - $('#insee').html(data.insee); - $('.attente').css('display', 'none'); - $('.comptage').css('display', 'block'); + var html = 'Nombre sélectionnées : ' + + data.count + ' (dont '+ + data.insee +' unité(s) insee)'; + $('#attente').css('display', 'none'); + $('#comptage').html(html).css('display','block'); }, 'json') .error(function(){ alert('error'); }); } diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css index deff339d..be662264 100644 --- a/public/themes/default/styles/main.css +++ b/public/themes/default/styles/main.css @@ -21,15 +21,17 @@ body { } #header #message { - color: #000000; clear: right; float: right; margin-top: 34px; font-size: 1.2em; + background-color: #ffffff; + color: #000000; + text-align:center; line-height: 25px; margin-bottom: 2px; padding: 0 1em; - width:350px; + width:450px; } #header h1 { @@ -199,6 +201,10 @@ h3 { font-size: 1em; } +#comptage .valeur { + font-weight:bold; +} + #tabs { float:left; margin: 2px;