diff options
| -rw-r--r-- | chimere/static/chimere/css/forms.css | 29 | ||||
| -rw-r--r-- | chimere/static/chimere/js/edit_route_map.js | 1 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit.html | 104 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit_route.html | 95 | ||||
| -rw-r--r-- | example_project/locale/fr/LC_MESSAGES/django.po | 8 |
5 files changed, 139 insertions, 98 deletions
diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css index 7c6c4e8..5740a62 100644 --- a/chimere/static/chimere/css/forms.css +++ b/chimere/static/chimere/css/forms.css @@ -14,6 +14,27 @@ /**/ +div.rightWrapper{ + width: 100%; + float:left; +} + +div.rightform{ + margin-left:400px; + height:400px; +} + +div.leftform{ + float: left; + width: 400px; + margin-left: -100%; +} + +div.bottomform{ + clear: left; + width: 100%; +} + #map_edit{ margin:0; border: 1px solid black; @@ -81,10 +102,14 @@ } .help-route{ - width:98%; + width:250px; + float:right; + position:absolute; + z-index:1000; + right:45px; background-color:#EEF;; margin: 10px 0; - padding:0 4px; + padding:2px 6px 4px 6px; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; diff --git a/chimere/static/chimere/js/edit_route_map.js b/chimere/static/chimere/js/edit_route_map.js index 1650983..3428e90 100644 --- a/chimere/static/chimere/js/edit_route_map.js +++ b/chimere/static/chimere/js/edit_route_map.js @@ -19,6 +19,7 @@ See the file COPYING for details. function toggleDraw() { jQuery('#draw-toggle-off').hide(); jQuery('#draw-or').hide(); + jQuery('#draw-label').hide(); jQuery('#upload').hide(); jQuery('#map_edit').show(); jQuery('#help-route-create').show(); diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html index 5108ab2..cb08623 100644 --- a/chimere/templates/chimere/edit.html +++ b/chimere/templates/chimere/edit.html @@ -22,61 +22,69 @@ {% endif %}</fieldset> <fieldset class='edit'> <legend>{% trans "Add/modify a site" %}</legend> - <p>* {% trans "indicates a mandatory field" %}</p> <form enctype="multipart/form-data" method='post' action='.'> {% csrf_token %} - <div class="fieldWrapper"> - <label for="id_name">{% trans "Site name"%} *</label> - {% if form.name.errors %}<div class='errors'>{{ form.name.errors }}</div>{% endif %} - {{ form.name }} + <div class='rightWrapper'> + <div class='rightform'> + <div class="fieldWrapper"> + <label for="id_point">{% trans "Point"%} *</label> + {%if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%} + {{point_widget}} + </div> + </div> </div> - <div class="fieldWrapper"> - <label for="id_subcategory">{% trans "Categories" %} *</label> - {% if form.categories.errors %}<div class='errors'>{{ form.categories.errors }}</div>{% endif %} - {{ form.categories }} + <div class='leftform'> + <p>* {% trans "indicates a mandatory field" %}</p> + <div class="fieldWrapper"> + <label for="id_name">{% trans "Site name"%} *</label> + {% if form.name.errors %}<div class='errors'>{{ form.name.errors }}</div>{% endif %} + {{ form.name }} + </div> + <div class="fieldWrapper"> + <label for="id_subcategory">{% trans "Categories" %} *</label> + {% if form.categories.errors %}<div class='errors'>{{ form.categories.errors }}</div>{% endif %} + {{ form.categories }} + </div> + <div class="fieldWrapper"> + <label for="id_description">{% trans "Description" %}</label> + {{ form.description.errors }} + {{ form.description }} + <p class="help">{{ form.description.help_text }}</p> + </div> + {% if dated %} + <div class="fieldWrapper"> + <label for="id_start_date">{% trans "Start date" %}</label> + {{ form.start_date.errors }} + {{ form.start_date }} + <p class="help">{{ form.start_date.help_text }}</p> + </div> + <div class="fieldWrapper"> + <label for="id_end_date">{% trans "End date" %}</label> + {{ form.end_date.errors }} + {{ form.end_date }} + <p class="help">{{ form.end_date.help_text }}</p> + </div> + {% endif %} </div> - <div class="fieldWrapper"> - <label for="id_point">{% trans "Point"%} *</label> - {%if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%} - {{point_widget}} - </div> - <div class="fieldWrapper"> - <label for="id_description">{% trans "Description" %}</label> - {{ form.description.errors }} - {{ form.description }} - <p class="help">{{ form.description.help_text }}</p> - </div> - {% if dated %} - <div class="fieldWrapper"> - <label for="id_start_date">{% trans "Start date" %}</label> - {{ form.start_date.errors }} - {{ form.start_date }} - <p class="help">{{ form.start_date.help_text }}</p> - </div> - <div class="fieldWrapper"> - <label for="id_end_date">{% trans "End date" %}</label> - {{ form.end_date.errors }} - {{ form.end_date }} - <p class="help">{{ form.end_date.help_text }}</p> - </div> - {% endif %} - {% for field in form %} - {% for property in properties %} - {% ifequal field.name property %} - <div class="fieldWrapper"> - <label for="id_{{field.name}}">{% trans field.label %}</label> - {{ field.errors }} - {% if field.errors %}<div class='errors'>{{ field.errors }}</div>{% endif %} - {{ field }} - </div> - {%endifequal%} + <div class='bottomform'> + {% for field in form %} + {% for property in properties %} + {% ifequal field.name property %} + <div class="fieldWrapper"> + <label for="id_{{field.name}}">{% trans field.label %}</label> + {{ field.errors }} + {% if field.errors %}<div class='errors'>{{ field.errors }}</div>{% endif %} + {{ field }} + </div> + {%endifequal%} + {%endfor%} {%endfor%} - {%endfor%} - {% inline_formset "Multimedia files" formset_multi %} - {% inline_formset "Picture files" formset_picture %} + {% inline_formset "Multimedia files" formset_multi %} + {% inline_formset "Picture files" formset_picture %} - <p><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p> + <p><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p> + </div> </form> </fieldset> </div> diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html index fb4cf9a..a8121db 100644 --- a/chimere/templates/chimere/edit_route.html +++ b/chimere/templates/chimere/edit_route.html @@ -19,56 +19,63 @@ {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %} <fieldset class='edit'> <legend>{% trans "Add/modify a route" %}</legend> - <p>* {% trans "indicates a mandatory field" %}</p> <form enctype="multipart/form-data" method='post' action='.'> {% csrf_token %} - <div class="fieldWrapper"> - <label for="id_name">{% trans "Site name"%} *</label> - {{ form.name.errors }} - {{ form.name }} + <div class='rightWrapper'> + <div class='rightform'> + <div class="fieldWrapper"> + <label for="id_route">{% trans "Route"%} *</label> + {%if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%} + {{route_widget}} + </div> + </div> </div> - <div class="fieldWrapper"> - <label for="id_subcategory">{% trans "Categories" %} *</label> - {{ form.categories.errors }} - {{ form.categories }} + <div class='leftform'> + <p>* {% trans "indicates a mandatory field" %}</p> + <div class="fieldWrapper"> + <label for="id_name">{% trans "Site name"%} *</label> + {{ form.name.errors }} + {{ form.name }} + </div> + <div class="fieldWrapper"> + <label for="id_subcategory">{% trans "Categories" %} *</label> + {{ form.categories.errors }} + {{ form.categories }} + </div> + <div class="fieldWrapper"> + <label for="id_description">{% trans "Description" %} *</label> + {{ form.description.errors }} + {{ form.description }} + </div> + {% if dated %} + <div class="fieldWrapper"> + <label for="id_start_date">{% trans "Start date" %}</label> + {{ form.start_date.errors }} + {{ form.start_date }} + <p class="help">{{ form.start_date.help_text }}</p> + </div> + <div class="fieldWrapper"> + <label for="id_end_date">{% trans "End date" %}</label> + {{ form.end_date.errors }} + {{ form.end_date }} + <p class="help">{{ form.end_date.help_text }}</p> + </div> + {% endif %} </div> - <div class="fieldWrapper"> - <label for="id_route">{% trans "Route"%} *</label> - {%if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%} - {{route_widget}} - </div> - <!-- - <div class="fieldWrapper"> - <label for="id_picture">{% trans "Image" %}</label> - {{ form.picture.errors }} - {{ form.picture }} - </div>--> - {% if dated %} - <div class="fieldWrapper"> - <label for="id_start_date">{% trans "Start date" %}</label> - {{ form.start_date.errors }} - {{ form.start_date }} - <p class="help">{{ form.start_date.help_text }}</p> - </div> - <div class="fieldWrapper"> - <label for="id_end_date">{% trans "End date" %}</label> - {{ form.end_date.errors }} - {{ form.end_date }} - <p class="help">{{ form.end_date.help_text }}</p> - </div> - {% endif %} - {%for field in form%}{%for property in properties%}{%ifequal field.name property%} - <div class="fieldWrapper"> - <label for="id_{{field.name}}">{% trans field.label %}</label> - {{ field.errors }} - {{ field }} - </div> - {%endifequal%}{%endfor%}{%endfor%} + <div class='bottomform'> + {%for field in form%}{%for property in properties%}{%ifequal field.name property%} + <div class="fieldWrapper"> + <label for="id_{{field.name}}">{% trans field.label %}</label> + {{ field.errors }} + {{ field }} + </div> + {%endifequal%}{%endfor%}{%endfor%} - {% inline_formset "Multimedia files" formset_multi %} - {% inline_formset "Picture files" formset_picture %} + {% inline_formset "Multimedia files" formset_multi %} + {% inline_formset "Picture files" formset_picture %} - <p><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p> + <p><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p> + </div> </form> </fieldset> </div> diff --git a/example_project/locale/fr/LC_MESSAGES/django.po b/example_project/locale/fr/LC_MESSAGES/django.po index 8ef85f9..2f730e4 100644 --- a/example_project/locale/fr/LC_MESSAGES/django.po +++ b/example_project/locale/fr/LC_MESSAGES/django.po @@ -656,7 +656,7 @@ msgstr "Mode création" #: extra-locales/chimere/widgets.py:245 msgid "To start drawing the route click on the toggle button: \"Draw\"." -msgstr "Pour commencer le dessin cliquez sur le bouton : « Tracer » " +msgstr "Pour commencer le dessin cliquez sur le bouton : « Tracer »." #: extra-locales/chimere/widgets.py:247 msgid "Then click on the map to begin the drawing." @@ -679,8 +679,8 @@ msgid "" "While creating to undo a drawing click again on the toggle button \"Stop " "drawing\"." msgstr "" -"En mode création vous pouvez annuler un tracé en appuyant sur le bouton « " -"Arrêter le tracé »" +"En mode création vous pouvez annuler un tracé en appuyant sur le bouton « " +"Arrêter le tracé »." #: extra-locales/chimere/widgets.py:256 msgid "Modification mode" @@ -698,7 +698,7 @@ msgid "" "\" key." msgstr "" "Pour supprimer un point, mettez le curseur de la souris sur celui-ci et " -"appuyez sur le touche « d » ou « Suppr »" +"appuyez sur le touche « d » ou « Suppr »." #: extra-locales/chimere/widgets.py:260 msgid "" |