widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #15125
Re: [Merge] lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website
Found a couple of small typos in the texts.
I think some alpha testing might be good, to make sure you haven't missed any pages.
Diff comments:
>
> === modified file 'templates/registration/logout.html'
> --- templates/registration/logout.html 2013-06-30 11:52:47 +0000
> +++ templates/registration/logout.html 2018-10-15 17:58:30 +0000
> @@ -4,9 +4,11 @@
> Logout - {{ block.super }}
> {% endblock %}
>
> -{% block content %}
> +{% block content_header %}
> + <h1>Lougout</h1>
Typo
> +{% endblock %}
>
> -<h1>Lougout</h1>
> +{% block content_main %}
> <div class="blogEntry">
> You have been logged out.
> </div>
>
> === modified file 'templates/wlhelp/inlines/tribes_details.html'
> --- templates/wlhelp/inlines/tribes_details.html 2018-03-09 11:26:52 +0000
> +++ templates/wlhelp/inlines/tribes_details.html 2018-10-15 17:58:30 +0000
> @@ -1,7 +1,8 @@
> <div>
> - <img class="posLeft icon" src="{{ tribe.icon_url }}" alt="" />
> + <img class="posLeft icon" src="{{ tribe.icon_url }}" alt="Tribes Icon" />
Tribe's Icon
> <p>{{ tribe.descr }}</p>
> </div>
> +
> <ul>
> <li><a href="{% url 'wlhelp_buildings' tribe.name %}">Buildings</a></li>
> <li><a href="{% url 'wlhelp_wares' tribe.name %}">Wares</a></li>
>
> === modified file 'templates/wlscheduling/find.html'
> --- templates/wlscheduling/find.html 2018-02-11 16:25:40 +0000
> +++ templates/wlscheduling/find.html 2018-10-15 17:58:30 +0000
> @@ -3,16 +3,18 @@
> vim:ft=htmldjango
> {% endcomment %}
>
> -{% block content %}
> +{% block content_header %}
> + <h1>Scheduling: Other users playtimes</h1>
users'
> +{% endblock %}
> +
> +{% block content_main %}
> <script type="text/javascript">
> document.addEventListener('DOMContentLoaded', function(){
> addTimeZoneWarningIfNeeded();
> addOtherUsersAvailabilities();
> }, false);
> </script>
> -
> <div class="blogEntry">
> - <h1>Times other players are available</h1>
> {% include "wlscheduling/timezone-msg.html" %}
> <div id="other-users-wrapper"></div>
> <div id="no-user-to-display" hidden="hidden">Sorry currently there isn't anybody who has scheduled a gaming session. Don't hesitate to signal to other when you'll be available <a href="{% url 'scheduling_scheduling' %}">here</a></div>
>
> === modified file 'templates/wlscheduling/main.html'
> --- templates/wlscheduling/main.html 2017-12-23 09:15:02 +0000
> +++ templates/wlscheduling/main.html 2018-10-15 17:58:30 +0000
> @@ -4,11 +4,12 @@
> vim:ft=htmldjango
> {% endcomment %}
>
> -{% block content %}
> -
> -
> +{% block content_header %}
> +<h1>Welcome in the scheduling module!</h1>
Welcome to
> +{% endblock %}
> +
> +{% block content_main %}
> <div class="blogEntry">
> - <h1>Welcome in the scheduling module!</h1>
> <div id="main-choices" class="main-choices">
> <a href="{% url 'scheduling_scheduling' %}" >
> <button title="You know when you will be available to play and want to display when you're available and find other players that will be available at these hours">Define your playtime and find a game</button>
--
https://code.launchpad.net/~widelands-dev/widelands-website/tabbed_profile/+merge/356749
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website.
References