Moves the BFS map into the table

OneGov · May 2, 2019 · 0008072 · 0008072
1 parent 58914ff
commit 0008072
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 22 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,7 +1,15 @@
 Changelog
 ---------
+
+- Moves the BFS map into the table.
+  [msom]
+
 0.0.53 (2019-04-30)
 ~~~~~~~~~~~~~~~~~~~
+
+- Nothing.
+  [msom]
+
 0.0.52 (2019-04-30)
 ~~~~~~~~~~~~~~~~~~~
 

diff --git a/onegov/swissvotes/locale/de_CH/LC_MESSAGES/onegov.swissvotes.po b/onegov/swissvotes/locale/de_CH/LC_MESSAGES/onegov.swissvotes.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-08 11:30+0200\n"
-"PO-Revision-Date: 2019-04-08 11:31+0200\n"
+"POT-Creation-Date: 2019-05-02 09:56+0200\n"
+"PO-Revision-Date: 2019-05-02 09:56+0200\n"
 "Last-Translator: Marc Sommerhalder <marc.sommerhalder@seantis.ch>\n"
 "Language-Team: German\n"
 "Language: de_CH\n"
@@ -1452,6 +1452,9 @@ msgstr "Stände"
 msgid "Turnout"
 msgstr "Stimmbeteiligung"
 
+msgid "Interactive map of the Swiss Federal Statistical Office"
+msgstr "Interaktive Karte des Bundesamts für Statistik"
+
 msgid "You are here"
 msgstr "Aktuelle Seite"
 

diff --git a/onegov/swissvotes/locale/en_US/LC_MESSAGES/onegov.swissvotes.po b/onegov/swissvotes/locale/en_US/LC_MESSAGES/onegov.swissvotes.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2019-04-08 11:30+0200\n"
+"POT-Creation-Date: 2019-05-02 09:56+0200\n"
 "PO-Revision-Date: 2018-09-18 15:04+0200\n"
 "Last-Translator: Marc Sommerhalder <marc.sommerhalder@seantis.ch>\n"
 "Language-Team: English\n"
@@ -1443,6 +1443,9 @@ msgstr "Cantons"
 msgid "Turnout"
 msgstr "Turnout"
 
+msgid "Interactive map of the Swiss Federal Statistical Office"
+msgstr ""
+
 msgid "You are here"
 msgstr "You are here"
 

diff --git a/onegov/swissvotes/locale/fr_CH/LC_MESSAGES/onegov.swissvotes.po b/onegov/swissvotes/locale/fr_CH/LC_MESSAGES/onegov.swissvotes.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-08 11:30+0200\n"
+"POT-Creation-Date: 2019-05-02 09:56+0200\n"
 "PO-Revision-Date: 2018-09-18 11:29+0200\n"
 "Last-Translator: Marc Sommerhalder <marc.sommerhalder@seantis.ch>\n"
 "Language-Team: \n"
@@ -1453,6 +1453,9 @@ msgstr "Cantons"
 msgid "Turnout"
 msgstr "Participation"
 
+msgid "Interactive map of the Swiss Federal Statistical Office"
+msgstr ""
+
 msgid "You are here"
 msgstr "Vous êtes ici"
 

diff --git a/onegov/swissvotes/templates/vote.pt b/onegov/swissvotes/templates/vote.pt
@@ -290,27 +290,31 @@
                         <th class="column-30" i18n:translate>Result by canton, district and municipality</th>
                         <td><a href="${request.link(results_by_domain)}" target="_blank" class="results-by-domain">Excel</a></td>
                     </tr>
+                    <tr tal:condition="bfs_map">
+                        <td colspan="2">
+                            <div><strong i18n:translate>Interactive map of the Swiss Federal Statistical Office</strong></div>
+                            <div class="row" tal:condition="bfs_map">
+                                <div class="small-12 small-centered large-10 columns">
+                                    <iframe src="${bfs_map}"
+                                            frameborder="0"
+                                            marginheight="0"
+                                            marginwidth="0"
+                                            scrolling="no"
+                                            style="
+                                                width: 100%;
+                                                height: 600px;
+                                                margin: auto 0;
+                                                padding: 0;
+                                                cursor: auto;
+                                            ">
+                                    </iframe>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
 
-            <div class="row" tal:condition="bfs_map">
-                <div class="small-12 small-centered large-10 columns">
-                    <iframe src="${bfs_map}"
-                    		frameborder="0"
-                    		marginheight="0"
-                    		marginwidth="0"
-                    		scrolling="no"
-                    		style="
-                    			width: 100%;
-                    			height: 600px;
-                    			margin: auto 0;
-                    			padding: 0;
-                    			cursor: auto;
-                    		">
-                    </iframe>
-                </div>
-            </div>
-
         </div>
     </tal:block>
 </div>