Merge lp:~widelands-dev/widelands-website/map_version_gt_19 into lp:widelands-website

Proposed by kaputtnik
Status: Merged
Merged at revision: 475
Proposed branch: lp:~widelands-dev/widelands-website/map_version_gt_19
Merge into: lp:widelands-website
Diff against target: 37 lines (+14/-2)
2 files modified
templates/wlmaps/index.html (+7/-1)
templates/wlmaps/map_detail.html (+7/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands-website/map_version_gt_19
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+333591@code.launchpad.net

Description of the change

Add info for maps that requires a build > build19, depending on the number of players.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM, thanks for the quick fix :)

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Thanks :-)

Merged and deployed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'templates/wlmaps/index.html'
--- templates/wlmaps/index.html 2017-08-16 21:13:43 +0000
+++ templates/wlmaps/index.html 2017-11-12 16:18:54 +0000
@@ -56,7 +56,13 @@
56 </tr>56 </tr>
57 {% if not map.world_name %}57 {% if not map.world_name %}
58 <tr>58 <tr>
59 <td colspan="5"><strong>This map requires a version of Widelands newer than build18!</strong></td>59 <td colspan="5"><strong>This map requires a version of Widelands newer than build
60 {% if map.nr_players > 8 %}
61 19!
62 {% else %}
63 18!
64 {% endif %}
65 </strong></td>
60 </tr>66 </tr>
61 {% endif %}67 {% endif %}
62 <tr>68 <tr>
6369
=== modified file 'templates/wlmaps/map_detail.html'
--- templates/wlmaps/map_detail.html 2017-04-25 19:49:02 +0000
+++ templates/wlmaps/map_detail.html 2017-11-12 16:18:54 +0000
@@ -108,7 +108,13 @@
108 108
109 {% if not map.world_name %}109 {% if not map.world_name %}
110 <div>110 <div>
111 <strong>This map requires a version of Widelands newer than build18!</strong>111 <strong>This map requires a version of Widelands newer than build
112 {% if map.nr_players > 8 %}
113 19!
114 {% else %}
115 18!
116 {% endif %}
117 </strong>
112 </div>118 </div>
113 {% endif %}119 {% endif %}
114 </div>120 </div>

Subscribers

People subscribed via source and target branches