Mercurial Mercurial > plan4learning / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
save buttons in top of form
authorcavaliet
Fri, 20 Sep 2013 11:43:49 +0200
changeset 110 7a2b612ca5e0
parent 109 9328fa268f45
child 111 e2ecb345b58f
save buttons in top of form
src/p4l/locale/en/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/p4l/locale/es/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/p4l/locale/fr/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/p4l/locale/fr/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/p4l/templates/p4l/record_update_form.html file | annotate | diff | comparison | revisions 
--- a/src/p4l/locale/en/LC_MESSAGES/django.po	Fri Sep 20 11:27:44 2013 +0200
+++ b/src/p4l/locale/en/LC_MESSAGES/django.po	Fri Sep 20 11:43:49 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-18 09:42-0500\n"
+"POT-Creation-Date: 2013-09-20 04:40-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -130,16 +130,16 @@
 
 #: templates/p4l/p4l_record_view.html:11
 #: templates/p4l/p4l_record_view.html:237
-#: templates/p4l/record_update_form.html:48
-#: templates/p4l/record_update_form.html:236
+#: templates/p4l/record_update_form.html:61
+#: templates/p4l/record_update_form.html:249
 msgid ""
 "Are your sure you want to delete this record ? This action est irreversible."
 msgstr ""
 
 #: templates/p4l/p4l_record_view.html:11
 #: templates/p4l/p4l_record_view.html:237
-#: templates/p4l/record_update_form.html:48
-#: templates/p4l/record_update_form.html:236
+#: templates/p4l/record_update_form.html:61
+#: templates/p4l/record_update_form.html:249
 #, fuzzy
 msgid "Delete the record"
 msgstr "Modify the record type"
@@ -325,8 +325,16 @@
 msgid "is restricted"
 msgstr ""
 
-#: templates/p4l/record_update_form.html:47
-#: templates/p4l/record_update_form.html:235
+#: templates/p4l/record_update_form.html:52 templates/p4l/translations.html:4
+msgid "Save"
+msgstr "Save"
+
+#: templates/p4l/record_update_form.html:56
+msgid "Cancel"
+msgstr ""
+
+#: templates/p4l/record_update_form.html:60
+#: templates/p4l/record_update_form.html:248
 #: templates/p4l/translations.html:20
 #, fuzzy
 msgid "View the record"
@@ -336,10 +344,6 @@
 msgid "Add"
 msgstr "Add"
 
-#: templates/p4l/translations.html:4
-msgid "Save"
-msgstr "Save"
-
 #: templates/p4l/translations.html:5
 msgid "Update"
 msgstr "Update"
--- a/src/p4l/locale/es/LC_MESSAGES/django.po	Fri Sep 20 11:27:44 2013 +0200
+++ b/src/p4l/locale/es/LC_MESSAGES/django.po	Fri Sep 20 11:43:49 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-18 09:42-0500\n"
+"POT-Creation-Date: 2013-09-20 04:40-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -131,16 +131,16 @@
 
 #: templates/p4l/p4l_record_view.html:11
 #: templates/p4l/p4l_record_view.html:237
-#: templates/p4l/record_update_form.html:48
-#: templates/p4l/record_update_form.html:236
+#: templates/p4l/record_update_form.html:61
+#: templates/p4l/record_update_form.html:249
 msgid ""
 "Are your sure you want to delete this record ? This action est irreversible."
 msgstr ""
 
 #: templates/p4l/p4l_record_view.html:11
 #: templates/p4l/p4l_record_view.html:237
-#: templates/p4l/record_update_form.html:48
-#: templates/p4l/record_update_form.html:236
+#: templates/p4l/record_update_form.html:61
+#: templates/p4l/record_update_form.html:249
 #, fuzzy
 msgid "Delete the record"
 msgstr "Modify the record type"
@@ -326,8 +326,16 @@
 msgid "is restricted"
 msgstr ""
 
-#: templates/p4l/record_update_form.html:47
-#: templates/p4l/record_update_form.html:235
+#: templates/p4l/record_update_form.html:52 templates/p4l/translations.html:4
+msgid "Save"
+msgstr "Save"
+
+#: templates/p4l/record_update_form.html:56
+msgid "Cancel"
+msgstr ""
+
+#: templates/p4l/record_update_form.html:60
+#: templates/p4l/record_update_form.html:248
 #: templates/p4l/translations.html:20
 #, fuzzy
 msgid "View the record"
@@ -337,10 +345,6 @@
 msgid "Add"
 msgstr "Add"
 
-#: templates/p4l/translations.html:4
-msgid "Save"
-msgstr "Save"
-
 #: templates/p4l/translations.html:5
 msgid "Update"
 msgstr "Update"
Binary file src/p4l/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/p4l/locale/fr/LC_MESSAGES/django.po	Fri Sep 20 11:27:44 2013 +0200
+++ b/src/p4l/locale/fr/LC_MESSAGES/django.po	Fri Sep 20 11:43:49 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-18 09:42-0500\n"
+"POT-Creation-Date: 2013-09-20 04:40-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,8 +142,8 @@
 
 #: templates/p4l/p4l_record_view.html:11
 #: templates/p4l/p4l_record_view.html:237
-#: templates/p4l/record_update_form.html:48
-#: templates/p4l/record_update_form.html:236
+#: templates/p4l/record_update_form.html:61
+#: templates/p4l/record_update_form.html:249
 msgid ""
 "Are your sure you want to delete this record ? This action est irreversible."
 msgstr "Êtes-vous sûr sur vouloir effacer cette notice ? Cette action est "
@@ -151,8 +151,8 @@
 
 #: templates/p4l/p4l_record_view.html:11
 #: templates/p4l/p4l_record_view.html:237
-#: templates/p4l/record_update_form.html:48
-#: templates/p4l/record_update_form.html:236
+#: templates/p4l/record_update_form.html:61
+#: templates/p4l/record_update_form.html:249
 msgid "Delete the record"
 msgstr "Effacer la notice"
 
@@ -336,8 +336,17 @@
 msgid "is restricted"
 msgstr "restreint"
 
-#: templates/p4l/record_update_form.html:47
-#: templates/p4l/record_update_form.html:235
+#: templates/p4l/record_update_form.html:52
+#: templates/p4l/translations.html:4
+msgid "Save"
+msgstr "Enregistrer"
+
+#: templates/p4l/record_update_form.html:56
+msgid "Cancel"
+msgstr "Annuler"
+
+#: templates/p4l/record_update_form.html:60
+#: templates/p4l/record_update_form.html:248
 #: templates/p4l/translations.html:20
 msgid "View the record"
 msgstr "Voir la notice"
@@ -346,10 +355,6 @@
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/p4l/translations.html:4
-msgid "Save"
-msgstr "Sauver"
-
 #: templates/p4l/translations.html:5
 msgid "Update"
 msgstr "Mettre à jour"
--- a/src/p4l/templates/p4l/record_update_form.html	Fri Sep 20 11:27:44 2013 +0200
+++ b/src/p4l/templates/p4l/record_update_form.html	Fri Sep 20 11:43:49 2013 +0200
@@ -43,13 +43,25 @@
 {% endblock %}
 
 {% block content %}
-<div class="row text-right">
+<div ng-app="recordApp" ng-controller="RecordCtrl" ng-cloak>
+<form name="recordForm">
+<div class="row">
+  <div class="col-md-6">
+    <button type="submit" class="btn btn-primary" id="record-submit" ng-click="submitRecord()">
+        <span ng-class="['glyphicon', saving?'spinner':'glyphicon-save']"></span>
+        <span>{% trans 'Save' %}</span>
+    </button>
+    <a class="btn btn-primary" id="record-back" href="{% templatetag openvariable %}getPreviousUrl(){% templatetag closevariable %}">
+        <span class="glyphicon glyphicon-arrow-left"></span>
+        <span>{% trans 'Cancel' %}</span>
+    </a>
+  </div>
+  <div class="col-md-6 text-right">
     <a class="btn btn-default" href="{% url 'p4l_record_view' slug=record.identifier %}">{% trans 'View the record' %} <i class="glyphicon glyphicon-eye-open"></i></a>
     <a class="btn btn-default" href="{% url 'p4l_record_delete' slug=record.identifier %}" onclick="return confirm('{% trans 'Are your sure you want to delete this record ? This action est irreversible.' %}')">{% trans 'Delete the record' %} <i class="glyphicon glyphicon-trash"></i></a>
+  </div>
 </div>
 {% verbatim %}
-<div ng-app="recordApp" ng-controller="RecordCtrl" ng-cloak>
-<form name="recordForm">
 <table class="table record-table">
   <thead>
     <tr><td>{{'property' | translate}}</td><td>{{'value' | translate }}</td></tr>
@@ -220,19 +232,22 @@
     </tr>
   </tbody>
 </table>
-<button type="submit" class="btn btn-primary" id="record-submit" ng-click="submitRecord()">
-    <span ng-class="['glyphicon', saving?'spinner':'glyphicon-save']"></span>
-    <span>{{ 'Save' | translate }}</span>
-</button>
-<a class="btn btn-primary" id="record-back" href="{{getPreviousUrl()}}">
-    <span class="glyphicon glyphicon-arrow-left"></span>
-    <span>{{ 'Cancel' | translate }}</span>
-</a>
-</form>
-</div>
+<div class="row">
+  <div class="col-md-6">
+	<button type="submit" class="btn btn-primary" id="record-submit" ng-click="submitRecord()">
+	    <span ng-class="['glyphicon', saving?'spinner':'glyphicon-save']"></span>
+	    <span>{{ 'Save' | translate }}</span>
+	</button>
+	<a class="btn btn-primary" id="record-back" href="{{getPreviousUrl()}}">
+	    <span class="glyphicon glyphicon-arrow-left"></span>
+	    <span>{{ 'Cancel' | translate }}</span>
+	</a>
+  </div>
 {% endverbatim %}
-<div class="row text-right">
+  <div class="col-md-6 text-right">
     <a class="btn btn-default" href="{% url 'p4l_record_view' slug=record.identifier %}">{% trans 'View the record' %} <i class="glyphicon glyphicon-eye-open"></i></a>
     <a class="btn btn-default" href="{% url 'p4l_record_delete' slug=record.identifier %}" onclick="return confirm('{% trans 'Are your sure you want to delete this record ? This action est irreversible.' %}')">{% trans 'Delete the record' %} <i class="glyphicon glyphicon-trash"></i></a>
+  </div>
 </div>
+</form>
 {% endblock %}
\ No newline at end of file
plan4learning