aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--locale/FixMyStreetMobileApp.po22
-rw-r--r--locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po22
-rw-r--r--locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po23
-rw-r--r--www/templates/es/existing.html4
-rw-r--r--www/templates/es/offline.html8
-rw-r--r--www/templates/es/photo.html64
-rw-r--r--www/templates/es/reports.html2
7 files changed, 86 insertions, 59 deletions
diff --git a/locale/FixMyStreetMobileApp.po b/locale/FixMyStreetMobileApp.po
index dbb7935..299a91b 100644
--- a/locale/FixMyStreetMobileApp.po
+++ b/locale/FixMyStreetMobileApp.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: struan@mysociety.org\n"
-"POT-Creation-Date: 2017-06-22 15:28+0100\n"
+"POT-Creation-Date: 2017-06-23 17:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -21,6 +21,10 @@ msgstr ""
msgid "(optional)"
msgstr ""
+#: templates/photo.html:20
+msgid "(required)"
+msgstr ""
+
#: templates/existing.html:12 templates/strings.js:42
msgid "-- Pick a category --"
msgstr ""
@@ -38,10 +42,10 @@ msgid "Account"
msgstr ""
#: templates/photo.html:3
-msgid "Add Photo"
+msgid "Add Photos"
msgstr ""
-#: templates/photo.html:18
+#: templates/photo.html:16
msgid "Add a Photo"
msgstr ""
@@ -49,7 +53,7 @@ msgstr ""
msgid "Add a Photo "
msgstr ""
-#: templates/offline.html:56 templates/photo.html:34
+#: templates/offline.html:56 templates/photo.html:45
msgid "Add an existing photo"
msgstr ""
@@ -205,7 +209,7 @@ msgstr ""
msgid "New Report Here"
msgstr ""
-#: templates/details.html:4 templates/details_extra.html:4 templates/photo.html:7 templates/strings.js:23
+#: templates/details.html:4 templates/details_extra.html:4 templates/photo.html:9 templates/strings.js:23
msgid "Next"
msgstr ""
@@ -245,8 +249,8 @@ msgstr ""
msgid "Photo added"
msgstr ""
-#: templates/photo.html:21
-msgid "Photo for report"
+#: templates/photo.html:25
+msgid "Photos for report"
msgstr ""
#: templates/strings.js:11
@@ -389,7 +393,7 @@ msgstr ""
msgid "Signed out!"
msgstr ""
-#: templates/offline.html:4 templates/photo.html:5
+#: templates/offline.html:4 templates/photo.html:6
msgid "Skip"
msgstr ""
@@ -409,7 +413,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/offline.html:55 templates/photo.html:35
+#: templates/offline.html:55 templates/photo.html:46
msgid "Take a new photo"
msgstr ""
diff --git a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
index f7a7cb0..f3ea0c9 100644
--- a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
+++ b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: struan@mysociety.org\n"
-"POT-Creation-Date: 2017-06-22 15:28+0100\n"
+"POT-Creation-Date: 2017-06-23 17:59+0100\n"
"PO-Revision-Date: 2013-09-18 18:01+0100\n"
"Last-Translator: Struan <struan@mysociety.org>\n"
"Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -21,6 +21,10 @@ msgstr ""
msgid "(optional)"
msgstr ""
+#: templates/photo.html:20
+msgid "(required)"
+msgstr ""
+
#: templates/existing.html:12 templates/strings.js:42
msgid "-- Pick a category --"
msgstr ""
@@ -38,10 +42,10 @@ msgid "Account"
msgstr ""
#: templates/photo.html:3
-msgid "Add Photo"
+msgid "Add Photos"
msgstr ""
-#: templates/photo.html:18
+#: templates/photo.html:16
msgid "Add a Photo"
msgstr ""
@@ -49,7 +53,7 @@ msgstr ""
msgid "Add a Photo "
msgstr ""
-#: templates/offline.html:56 templates/photo.html:34
+#: templates/offline.html:56 templates/photo.html:45
msgid "Add an existing photo"
msgstr ""
@@ -211,7 +215,7 @@ msgid "New Report Here"
msgstr ""
#: templates/details.html:4 templates/details_extra.html:4
-#: templates/photo.html:7 templates/strings.js:23
+#: templates/photo.html:9 templates/strings.js:23
msgid "Next"
msgstr ""
@@ -251,8 +255,8 @@ msgstr ""
msgid "Photo added"
msgstr ""
-#: templates/photo.html:21
-msgid "Photo for report"
+#: templates/photo.html:25
+msgid "Photos for report"
msgstr ""
#: templates/strings.js:11
@@ -399,7 +403,7 @@ msgstr ""
msgid "Signed out!"
msgstr ""
-#: templates/offline.html:4 templates/photo.html:5
+#: templates/offline.html:4 templates/photo.html:6
msgid "Skip"
msgstr ""
@@ -419,7 +423,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/offline.html:55 templates/photo.html:35
+#: templates/offline.html:55 templates/photo.html:46
msgid "Take a new photo"
msgstr ""
diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
index 12d6404..5af390a 100644
--- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
@@ -25,6 +25,11 @@ msgstr ""
msgid "(optional)"
msgstr "(opcional)"
+#: templates/photo.html:20
+#, fuzzy
+msgid "(required)"
+msgstr "requerido(a)"
+
#: templates/existing.html:12 templates/strings.js:42
msgid "-- Pick a category --"
msgstr "-- Seleccione una categoría --"
@@ -42,10 +47,11 @@ msgid "Account"
msgstr "Cuenta"
#: templates/photo.html:3
-msgid "Add Photo"
+#, fuzzy
+msgid "Add Photos"
msgstr "Añadir foto"
-#: templates/photo.html:18
+#: templates/photo.html:16
msgid "Add a Photo"
msgstr "Añadir una foto"
@@ -53,7 +59,7 @@ msgstr "Añadir una foto"
msgid "Add a Photo "
msgstr "Añadir una foto "
-#: templates/offline.html:56 templates/photo.html:34
+#: templates/offline.html:56 templates/photo.html:45
msgid "Add an existing photo"
msgstr "Añadir una foto existente"
@@ -215,7 +221,7 @@ msgid "New Report Here"
msgstr "Nuevo informe aquí"
#: templates/details.html:4 templates/details_extra.html:4
-#: templates/photo.html:7 templates/strings.js:23
+#: templates/photo.html:9 templates/strings.js:23
msgid "Next"
msgstr "Siguiente"
@@ -255,8 +261,9 @@ msgstr "Número de teléfono"
msgid "Photo added"
msgstr "Foto añadida"
-#: templates/photo.html:21
-msgid "Photo for report"
+#: templates/photo.html:25
+#, fuzzy
+msgid "Photos for report"
msgstr "Foto para el informe"
#: templates/strings.js:11
@@ -403,7 +410,7 @@ msgstr "¡Sesión abierta!"
msgid "Signed out!"
msgstr "¡Sesión cerrada!"
-#: templates/offline.html:4 templates/photo.html:5
+#: templates/offline.html:4 templates/photo.html:6
msgid "Skip"
msgstr "Saltar"
@@ -423,7 +430,7 @@ msgstr "Título"
msgid "Submit"
msgstr "Enviar"
-#: templates/offline.html:55 templates/photo.html:35
+#: templates/offline.html:55 templates/photo.html:46
msgid "Take a new photo"
msgstr "Tomar una nueva foto"
diff --git a/www/templates/es/existing.html b/www/templates/es/existing.html
index b45b3d8..baecd89 100644
--- a/www/templates/es/existing.html
+++ b/www/templates/es/existing.html
@@ -17,8 +17,8 @@
<p><% print( moment( created ).fromNow() ) %></p>
</div>
- <% if ( file ) { %>
- <div class="photo" style="background-image: url(<%= file %>)"></div>
+ <% if ( files.length > 0 ) { %>
+ <div class="photo" style="background-image: url(<%= files[0] %>)"></div>
<% } %>
<% if ( details ) { %>
diff --git a/www/templates/es/offline.html b/www/templates/es/offline.html
index 1051f57..4422408 100644
--- a/www/templates/es/offline.html
+++ b/www/templates/es/offline.html
@@ -46,7 +46,7 @@
</div>
</div>
- <% if ( file != '' ) { %>
+ <% if ( files.length > 0 ) { %>
<div id="add_photo" style="display: none">
<% } else { %>
<div id="add_photo">
@@ -56,16 +56,16 @@
<input data-icon="fms-photo-existing" value="Añadir una foto existente" type="button" name="existing" id="id_existing" data-role="button" data-theme="c">
</div>
- <% if ( file == '' ) { %>
+ <% if ( files.length == 0 ) { %>
<div id="display_photo" style="display: none">
<% } else { %>
<div id="display_photo">
<% } %>
<label>Su foto</label>
<div class="photo">
- <img class="small" id="photo" src="<%= file %>" />
+ <img class="small" id="photo" src="<%= files[0] %>" />
</div>
- <input value="Eliminar foto" type="button" name="del_photo_button" id="id_del_photo_button" data-role="button" data-theme="a">
+ <input value="Eliminar foto" type="button" name="del_photo_button" class="del_photo_button" data-role="button" data-theme="a">
</div>
</div>
</div>
diff --git a/www/templates/es/photo.html b/www/templates/es/photo.html
index 62f36dc..75de686 100644
--- a/www/templates/es/photo.html
+++ b/www/templates/es/photo.html
@@ -1,37 +1,49 @@
<div data-role="header">
<a data-rel="back" data-icon="arrow-l" class="ui-btn-left">Atrás</a>
- <h1>Añadir foto</h1>
- <% if ( file == '' ) { %>
- <a id="photo-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Saltar</a>
+ <h1>Add Photos</h1>
+ <% if ( files.length == 0 ) { %>
+ <% if ( !CONFIG.PHOTO_REQUIRED ) { %>
+ <a id="photo-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Saltar</a>
+ <% } %>
<% } else { %>
<a id="photo-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Siguiente</a>
<% } %>
</div>
+
<div data-role="content">
- <% var photoClass = 'nodisplay', nophotoClass = 'nodisplay';
- if ( file != '' ) {
- photoClass = '';
- } else {
- nophotoClass = '';
- } %>
- <h2 id="nophoto_title" class="<% print( nophotoClass ); %>">
- Añadir una foto <em>(opcional)</em>
- </h2>
- <h2 id="photo_title" class="<% print( photoClass ); %>">
- Foto para el informe
- </h2>
- <div class="photo-wrapper">
- <div class="photo">
- <% if ( file == '' ) { %>
- <img class="placeholder" src="images/placeholder-photo.png" alt="" id="photo">
+ <% if ( files.length == 0 ) { %>
+ <h2 id="nophoto_title">
+ Añadir una foto
+ <% if ( !CONFIG.PHOTO_REQUIRED ) { %>
+ <em>(opcional)</em>
+ <% } else if ( files.length == 0) { %>
+ <em>(required)</em>
+ <%} %>
+ </h2>
<% } else { %>
- <img class="small" id="photo" src="<%= file %>" />
+ <h2 id="photo_title">
+ Photos for report
+ </h2>
<% } %>
- <a data-role="none" id="id_del_photo_button" class="photo-corner-button">X</a>
- </div>
- </div>
- <div class="bottom-btn">
- <input data-icon="fms-photo-existing" type="button" id="id_existing" data-theme="c" value="Añadir una foto existente" >
- <input data-icon="fms-photo-new" id="id_photo_button" type="button" data-theme="a" value="Tomar una nueva foto">
+
+ <div class="photo-wrapper">
+ <% if ( files.length == 0 ) { %>
+ <div class="photo">
+ <img class="placeholder" src="images/placeholder-photo.png" alt="">
+ </div>
+ <% } else { %>
+ <% _.each(files, function(file, index) { %>
+ <div class="photo" style="background-image: url('<%= file %>');">
+ <a data-role="none" class="photo-corner-button del_photo_button" data-file-index="<%= index %>">X</a>
+ </div>
+ <% });%>
+ <% } %>
</div>
+
+ <% if ( files.length < CONFIG.MAX_PHOTOS ) { %>
+ <div class="bottom-btn">
+ <input data-icon="fms-photo-existing" type="button" id="id_existing" data-theme="c" value="Añadir una foto existente" >
+ <input data-icon="fms-photo-new" id="id_photo_button" type="button" data-theme="a" value="Tomar una nueva foto">
+ </div>
+ <% } %>
</div>
diff --git a/www/templates/es/reports.html b/www/templates/es/reports.html
index cbd2acf..05772a5 100644
--- a/www/templates/es/reports.html
+++ b/www/templates/es/reports.html
@@ -15,7 +15,7 @@
if ( draft.get('lat') ) {
classes.push('with_location');
}
- if ( draft.get('file') ) {
+ if ( draft.get('files').length > 0 ) {
classes.push('with_photo');
}
var draftClass = '';
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 01:30:20 +0000