simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mainly internationalisation improvements - not finished yet.

Browse source
This commit is contained in:
Simon Brooke 2017-09-07 14:44:13 +01:00
parent a7409c25be
commit d4ed336827
21 changed files with 90 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/templates/auth.html
View file

@ -6,21 +6,21 @@
<input type="hidden" name="redirect-to" value="{{redirect-to}}"/>
{% if user %}
<p class="widget">
<label for="submit">{{config.save-prompt}}</label>
<input name="action" id="action" type="submit" class="action-dangerous" value="{{config.logout-label}}"/>
<label for="submit">{% i18n save-prompt %}</label>
<input name="action" id="action" type="submit" class="action-dangerous" value="{% i18n logout-label %}"/>
</p>
{% else %}
<p class="widget">
<label for="username">{{config.your-uname-prompt}}</label>
<label for="username">{% i18n your-uname-prompt %}</label>
<input name="username" id="username" type="text" required/>
</p>
<p class="widget">
<label for="password">{{config.old-pass-prompt}}</label>
<label for="password">{% i18n old-pass-prompt %}</label>
<input name="password" id="password" type="password" required/>
</p>
<p class="widget">
<label for="submit">{{config.login-prompt}}</label>
<input name="action" id="action" type="submit" class="action" value="{{config.login-label}}"/>
<label for="submit">{% i18n login-prompt %}</label>
<input name="action" id="action" type="submit" class="action" value="{% i18n login-label %}"/>
</p>
{% endif %}
</form>

22
resources/templates/base.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>{{config.site-title}}: {{title}}</title>
<title>{% i18n site-title %}: {{title}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
@ -15,19 +15,19 @@
<div id="nav">
<img id="nav-icon" src="{{servlet-context}}/img/three-lines.png" alt="Menu"/>
<menu id="nav-menu">
<li class="{{wiki-selected}}"><a href="{{servlet-context}}/">{{config.home-link}}</a></li>
<li class="{{wiki-selected}}"><a href="{{servlet-context}}/">{% i18n home-link %}</a></li>
{% if admin %}
<li class="{{edit-users-selected}}"><a href="{{servlet-context}}/edit-users">{{config.edit-users-link}}</a></li>
<li class="{{edit-users-selected}}"><a href="{{servlet-context}}/edit-users">{% i18n edit-users-link %}</a></li>
{% endif %}
{% if user %}
<li class="{{upload-selected}}"><a href="upload">{{config.file-upload-title}}</a></li>
<li class="{{passwd-selected}}"><a href="passwd">{{config.change-pass-link}}</a></li>
<li class="user" id="user">{{config.logged-in-as}} {{user}}</li>
<li class="{{upload-selected}}"><a href="upload">{% i18n file-upload-title %}</a></li>
<li class="{{passwd-selected}}"><a href="passwd">{% i18n change-pass-link %}</a></li>
<li class="user" id="user">{% i18n logged-in-as}} {{user}}</li>
<li class="{{auth-selected}}"><a href="{{servlet-context}}/auth">
{{config.logout-link}}</a></li>
{% i18n logout-link %}</a></li>
{% else %}
<li class="{{auth-selected}}"><a href="{{servlet-context}}/auth">
{{config.login-link}}</a></li>
{% i18n login-link %}</a></li>
{% endif %}
</menu>
<div id="phone-side-bar" class="wiki">
@ -45,7 +45,7 @@
</div>
</div>
</div>
<h1>{{config.site-title}}: {{title}}</h1>
<h1>{% i18n site-title %}: {{title}}</h1>
{{header|safe}}
{% if message %}
<div id="message">
@ -68,10 +68,10 @@
</div>
<div id="cookies">
<div id="more-about-cookies">
{{config.cookies-more}}
{% i18n cookies-more %}
</div>
<div id="about-cookies">
{{config.cookies-about}}
{% i18n cookies-about %}
</div>
</div>
<footer>

6
resources/templates/edit-css.html
View file

@ -7,13 +7,13 @@
<input type="hidden" name="page" value="{{page}}"/>
<textarea name="src" id="src" rows="25" cols="80">{{content}}</textarea>
<p class="widget">
<label for="summary">{{config.what-changed-prompt}}</label>
<label for="summary">{% i18n what-changed-prompt %}</label>
<input name="summary" id="summary" type="text"
value="{%if exists%}{%else%}New file {{title}}{%endif%}" required/>
</p>
<p class="widget">
<label for="submit">{{config.save-prompt}}</label>
<input name="submit" id="submit" type="submit" class="action" value="{{config.save-label}}"/>
<label for="submit">{% i18n save-prompt %}</label>
<input name="submit" id="submit" type="submit" class="action" value="{% i18n save-label %}"/>
</p>
</form>
</div>

14
resources/templates/edit-user.html
View file

@ -5,28 +5,28 @@
<form action="{{servlet-context}}/edit-user" method="POST">
{% csrf-field %}
<p class="widget">
<label for="target">{{config.username-prompt}}</label>
<label for="target">{% i18n username-prompt %}</label>
<input type="text" name="target" id="target" value="{{target}}" required {% ifunequal target "" %}disabled{% endifunequal %}/>
</p>
<p class="widget">
<label for="pass1">{{config.new-pass-prompt}}</label>
<label for="pass1">{% i18n new-pass-prompt %}</label>
<input name="pass1" id="pass1" type="password"/>
</p>
<p class="widget">
<label for="pass2">{{config.rpt-pass-prompt}}</label>
<label for="pass2">{% i18n rpt-pass-prompt %}</label>
<input name="pass2" id="pass2" type="password"/>
</p>
<p class="widget">
<label for="email">{{config.email-prompt}}</label>
<label for="email">{% i18n email-prompt %}</label>
<input name="email" id="email" type="text" value="{{details.email}}" required/>
</p>
<p class="widget">
<label for="admin">{{config.is-admin-prompt}}</label>
<label for="admin">{% i18n is-admin-prompt %}</label>
<input name="admin" id="admin" type="checkbox" {% if details.admin %}checked{% endif %}/>
</p>
<p class="widget">
<label for="submit">{{config.save-prompt}}</label>
<input name="submit" id="submit" type="submit" class="action" value="{{config.save-label}}"/>
<label for="submit">{% i18n save-prompt %}</label>
<input name="submit" id="submit" type="submit" class="action" value="{% i18n save-label}}"/>
</p>
</form>
</div>

8
resources/templates/edit-users.html
View file

@ -4,17 +4,17 @@
<div id="content">
<table>
<tr>
<th/><th>{{config.edit-col-hdr}}</th><th>{{config.del-col-hdr}}</th>
<th/><th>{% i18n edit-col-hdr %}</th><th>{% i18n del-col-hdr %}</th>
</tr>
{% for user in users %}
<tr>
<td>{{user}}</td>
<td><a href="edit-user?target={{user}}">{{config.edit-col-hdr}} {{user}}</a></td>
<td><a href="delete-user?target={{user}}">{{config.del-col-hdr}} {{user}}</a></td>
<td><a href="edit-user?target={{user}}">{% i18n edit-col-hdr %} {{user}}</a></td>
<td><a href="delete-user?target={{user}}">{% i18n del-col-hdr %} {{user}}</a></td>
</tr>
{% endfor %}
<tr>
<td><a href="edit-user">{{config.add-user-label}}</a></td>
<td><a href="edit-user">{% i18n add-user-label %}</a></td>
<td></td>
<td></td>
</tr>

6
resources/templates/edit.html
View file

@ -11,13 +11,13 @@
<input type="hidden" name="page" value="{{page}}"/>
<textarea name="src" id="src" rows="25" cols="80">{{content}}</textarea>
<p class="widget">
<label for="summary">{{config.what-changed-prompt}}</label>
<label for="summary">{% i18n what-changed-prompt %}</label>
<input name="summary" id="summary" type="text"
value="{%if exists%}{%else%}New file {{title}}{%endif%}" required/>
</p>
<p class="widget">
<label for="submit">{{config.save-prompt}}</label>
<input name="submit" id="submit" type="submit" class="action" value="{{config.save-label}}"/>
<label for="submit">{% i18n save-prompt %}</label>
<input name="submit" id="submit" type="submit" class="action" value="{% i18n save-label %}"/>
</p>
</form>
</div>

8
resources/templates/history.html
View file

@ -3,10 +3,10 @@
<div id="content" class="history">
<table class="music-ruled">
<tr>
<th>{{config.when-col-hdr}}</th>
<th>{{config.what-col-hdr}}</th>
<th>{{config.vers-col-hdr}}</th>
<th>{{config.change-col-hdr}}</th>
<th>{% i18n when-col-hdr %}</th>
<th>{% i18n what-col-hdr %}</th>
<th>{% i18n vers-col-hdr %}</th>
<th>{% i18n change-col-hdr %}</th>
</tr>
{% for entry in history %}
<tr>

10
resources/templates/passwd.html
View file

@ -4,20 +4,20 @@
<form action="{{servlet-context}}/passwd" method="POST">
{% csrf-field %}
<p class="widget">
<label for="oldpass">{{config.old-pass-prompt}}</label>
<label for="oldpass">{% i18n old-pass-prompt %}</label>
<input name="oldpass" id="oldpass" type="password" required/>
</p>
<p class="widget">
<label for="pass1">{{config.new-pass-prompt}}</label>
<label for="pass1">{% i18n new-pass-prompt %}</label>
<input name="pass1" id="pass1" type="password" required/>
</p>
<p class="widget">
<label for="pass2">{{config.rpt-pass-prompt}}</label>
<label for="pass2">{% i18n rpt-pass-prompt %}</label>
<input name="pass2" id="pass2" type="password" required/>
</p>
<p class="widget">
<label for="submit">{{config.change-pass-prompt}}</label>
<input name="action" id="action" type="submit" class="action" value="{{config.change-pass-link}}!"/>
<label for="submit">{% i18n change-pass-prompt %}</label>
<input name="action" id="action" type="submit" class="action" value="{% i18n change-pass-link %}!"/>
</p>
</form>
</div>

10
resources/templates/upload.html
View file

@ -6,13 +6,13 @@
<img alt="Uploaded image" src="uploads/{{uploaded}}"/>
<p>
{{config.file-upload-link-text}}:
{% i18n file-upload-link-text %}:
<code>![Uploaded image](uploads/{{uploaded}})</code>
</p>
{% else %}
<p>
{{config.file-upload-link-text}}:
{% i18n file-upload-link-text %}:
<code>[Uploaded file](uploads/{{uploaded}})</code>
</p>
@ -21,12 +21,12 @@
<form action="{{servlet-context}}/upload" enctype="multipart/form-data" method="POST">
{% csrf-field %}
<p class="widget">
<label for="upload">{{config.file-upload-prompt}}</label>
<label for="upload">{% i18n file-upload-prompt %}</label>
<input name="upload" id="upload" type="file" required/>
</p>
<p class="widget">
<label for="submit">{{config.save-prompt}}</label>
<input name="submit" id="submit" type="submit" class="action" value="{{config.save-label}}"/>
<label for="submit">{% i18n save-prompt %}</label>
<input name="submit" id="submit" type="submit" class="action" value="{% i18n save-label %}"/>
</p>
</form>
{% endif %}

4
resources/templates/wiki.html
View file

@ -16,8 +16,8 @@
<div id="content" class="wiki">
{% if editable %}
<ul class="minor-controls">
<li><a href="{{servlet-context}}/edit?page={{title}}">{{config.edit-page-link}}</a></li>
<li><a href="history?page={{page}}">{{config.history-link}}</a></li>
<li><a href="{{servlet-context}}/edit?page={{title}}">{% i18n edit-page-link %}</a></li>
<li><a href="history?page={{page}}">{% i18n history-link %}</a></li>
</ul>
{% endif %}
{{content|safe}}