Use latest form text

* Take the opportunity to reformat the source to not have so many hugely long lines.
* Put a few things through gettext that weren't going through it before
* Move 'Hold down Ctrl to select multiple files at once.' text to widget, out of
  help text for each individual control.
This commit is contained in:
2019-04-07 15:55:29 +01:00
parent dc84e1a09a
commit 5cc0b7cdc1
6 changed files with 238 additions and 160 deletions

View File

@ -1,7 +1,14 @@
{% load i18n %}
<div class="filewidget" data-field="{{ widget.attrs.field }}">
<label class="filewidget--add btn btn-success">
<input class="filewidget--input" type="file" multiple data-url="{{ widget.attrs.url }}">
<i class="fa fa-plus"></i>&nbsp;Add files
</label>
<div style="display: flex; align-items: center">
<div>
<label class="filewidget--add btn btn-success">
<input class="filewidget--input" type="file" multiple data-url="{{ widget.attrs.url }}">
<i class="fa fa-plus"></i>&nbsp;{% trans "Add files" %}
</label>
</div>
<p class="only-windows" style="padding-left: 1em; margin-bottom: 0">{% trans "Hold down <span class='label label-default'>Ctrl</span> to select multiple files at once." %}</p>
<p class="only-mac" style="padding-left: 1em; margin-bottom: 0">{% trans "Hold down <span class='label label-default'>⌘ Cmd</span> to select multiple files at once." %}</p>
</div>
<ul class="filewidget--list"></ul>
</div>

View File

@ -46,25 +46,12 @@ html, body, #main {
<img class="hello--logo" align="center" src="{% static 'map/images/ojuso-logo-black.png' %}" alt="Ojuso">
{% blocktrans trimmed with forum_url='//forum.ojuso.org' %}
<p>
<b>ojuso</b>s aim is to promote best practice in the renewable energy
industry, to encourage divestment from ecologically and socially
destructive projects, and to foster improvements in supply chain and
lifecycle management in the sector.
<b>ojuso</b>s aims are to promote best practice in the renewable energy industry, to avoid investment in ecologically and socially destructive projects, and to foster improvements in supply chain and lifecycle management in the sector.
</p>
<p>
<b>ojuso</b> provides a platform for information exchange and
cooperation between different sectors involved in the renewable energy
economy and is supportive of ethical and ecologically sound practices.
This platform consists of an online map and database of positive and
negative case studies, contributed by communities affected by and
leading the transition, and a series of discussion fora and features,
contributed by a diversity of players.
</p>
<b>ojuso</b> provides a platform for information exchange and cooperation between different sectors involved in the renewable energy economy and is supportive of ethical and ecologically sound practices. This platform consists of an online map and database of positive and negative case studies, contributed by communities affected by, or leading, renewable energy projects, and of a series of discussion fora and features, contributed by diverse players.</p>
<p>
You are welcome to submit a case study through this map tool.
Following submission, cases will be moderated and, if successful,
placed on the map. If you need any help or have any suggestions,
please post messages on <a href="{{ forum_url }}">our forum</a>.
You are welcome to submit a case study through this tool. Following submission, cases will be moderated and, if successful, placed on the map. If you need any help or have any suggestions, please post messages on <a href="{{ forum_url }}">our forum</a>.
</p>
{% endblocktrans %}
<p class="text-muted">