Display a reminder of items concerned by the current edition (refs #1218)

4 files changed, 42 insertions, 36 deletions

diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 83e538331..e59f84e85 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -175,13 +175,31 @@ div#language_form_div label{
 
 div#context_menu{
     height:110px;
-    margin-left:200px;
-    margin-right:20px;
-    margin-bottom:20px;
+    float:right;
+    margin-right:10px;
+}
+
+div#context_menu fieldset{
+    background-color:#EEE;
+    border:2px solid #CCC;
+    -moz-border-radius:8px;
+    -webkit-border-radius:8px;
+    border-radius:8px;
+}
+
+div#context_menu ul{
+    margin:0;
+    padding:2px;
+}
+
+div#context_menu li{
+    margin: 0;
+    list-style:none;
 }
 
 div#main_menu{
     width:200px;
+    top:160px;
     position:absolute;
 }
 
@@ -203,37 +221,12 @@ div#main_menu .selected a{
     color:#D14;
 }
 
-
 div#main_menu > ul{
     color:#922;
 }
 
-div#context_menu fieldset{
-    right:20px;
-    position:absolute;
-    width:420px;
-    background-color:#EEE;
-    border:2px solid #CCC;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    border-radius:8px;
-}
-/*div#context_menu fieldset label{
-    display:inline;
-}*/
-
-div#context_menu ul{
-    margin:0;
-    padding:2px;
-}
-
-div#context_menu li{
-    margin: 0;
-    list-style:none;
-}
-
-
 div#content{
+    clear:both;
     margin:0 200px;
     text-align:center;
 }
@@ -268,17 +261,27 @@ ul#form_path button {
     font-family:Arial, Helvetica, sans-serif;
 }
 
-.reminder{
+#reminder{
     padding:0.4em;
+    margin-right:10px;
     border:1px solid #CCC;
     -moz-border-radius:8px;
     -webkit-border-radius:8px;
     border-radius:8px;
-    text-align:center;
-    width:400px;
-    margin-left:auto;
-    margin-right:auto;
     background-color:white;
+    float:right;
+}
+
+#reminder p{
+    margin:0;
+    padding:0;
+}
+
+#reminder strong.lbl,
+#reminder span.value {
+    display:inline-block;
+    max-width:250px;
+    vertical-align:top;
 }
 
 div.form {
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index e7fdf3e6f..e235df60a 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -78,6 +78,11 @@
         </form>
         {% endif %}{% endblock %}
     </div>
+{% if reminders %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend>
+{% for lbl, value in reminders%}
+<p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p>
+{% endfor %}
+</fieldset>{%endif%}
     <div id="main_menu">
     <ul>
       {% for section in MENU.childs %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index b2c7189cf..c1c0cb5cf 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -21,7 +21,6 @@
 {% block wizard_form %}
 <form action="." method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
 <div class='form'>
-{% if reminder %}<div class='reminder'>{{ reminder }}</div>{%endif%}
 {{ wizard.form.media }}
 {{ wizard.management_form }}
 {% if wizard.form.forms %}
diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
index 5d135a563..b550cf6c4 100644
--- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
@@ -6,7 +6,6 @@
 {% block wizard_form %}
 <form action="." method="post">{% csrf_token %}
 <div class='form'>
-{% if reminder %}<div class='reminder'>{{ reminder }}</div>{%endif%}
 {{ wizard.form.media }}
 {{ wizard.management_form }}
   {{ wizard.form.management_form }}