Widelands Website

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

  1. map_version_gt_19
  2. Merge into trunk
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
1=== modified file 'templates/wlmaps/index.html'
2--- templates/wlmaps/index.html 2017-08-16 21:13:43 +0000
3+++ templates/wlmaps/index.html 2017-11-12 16:18:54 +0000
4@@ -56,7 +56,13 @@
5 </tr>
6 {% if not map.world_name %}
7 <tr>
8- <td colspan="5"><strong>This map requires a version of Widelands newer than build18!</strong></td>
9+ <td colspan="5"><strong>This map requires a version of Widelands newer than build
10+ {% if map.nr_players > 8 %}
11+ 19!
12+ {% else %}
13+ 18!
14+ {% endif %}
15+ </strong></td>
16 </tr>
17 {% endif %}
18 <tr>
19
20=== modified file 'templates/wlmaps/map_detail.html'
21--- templates/wlmaps/map_detail.html 2017-04-25 19:49:02 +0000
22+++ templates/wlmaps/map_detail.html 2017-11-12 16:18:54 +0000
23@@ -108,7 +108,13 @@
24
25 {% if not map.world_name %}
26 <div>
27- <strong>This map requires a version of Widelands newer than build18!</strong>
28+ <strong>This map requires a version of Widelands newer than build
29+ {% if map.nr_players > 8 %}
30+ 19!
31+ {% else %}
32+ 18!
33+ {% endif %}
34+ </strong>
35 </div>
36 {% endif %}
37 </div>

Subscribers

People subscribed via source and target branches