Commit 21a30ba6 authored by Tom Tryfonidis's avatar Tom Tryfonidis Committed by Gil Forcada

Fixes for various pages

The fixes are: quick links in about page,download button,the statistics bar for a module,improvements to
person/module/language/people/diff/activity_summary pages

https://bugzilla.gnome.org/show_bug.cgi?id=681167
parent 4f5cc30c
table.diff {font-family:Courier; border:medium;}
.diff_header {background-color:#e0e0e0}
td.diff_header {text-align:right}
.diff_next {background-color:#c0c0c0}
table.diff {
font-family: Cantarell;
border: 1px solid #ccc;
}
/*.diff_header {background-color:#e0e0e0}*/ /* We use the class .djform - temaplate.css */
td.diff_header {
text-align: center;
padding: 5px 5px 0 5px;
}
.diff_next {
background-color:#d3d7cf;
border: 1px solid #ccc;
}
.diff_add {background-color:#aaffaa}
.diff_chg {background-color:#ffff77}
.diff_sub {background-color:#ffaaaa}
......@@ -32,6 +32,7 @@ a:visited {
.maxwidth {
width: 960px;
margin: 0 auto;
text-align: left;
}
.clear {
clear: both;
......@@ -193,7 +194,7 @@ a:visited {
#globalnav li a {
color: #fff;
text-decoration: none;
padding: 7px 8px;
padding: 4px 8px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
......@@ -408,11 +409,11 @@ table.stats tfoot {
pre.stats {
color: #333;
display: inline;
white-space: pre;
white-space: normal;
font-size: 10px;
}
pre.stats * {
padding: 0 1px;
}
pre.stats .num1 {
color: #4e9a06;
......@@ -426,11 +427,27 @@ pre.stats .num3 {
pre.stats .zero {
opacity: 0.7;
}
#stats_po {
padding: 5px 0 10px 5px;
font-size: 15px;
font-weight: bold;
color: #ce5c00;
}
/* Used in vertimus_detail */
div#vertimus_stats {
line-height: 1.3em;
}
div#vertimus_stats pre.stats {
white-space: normal;
font-family: sans-serif;
font-size: 13px;
}
/* Graphic stats */
.graph {
width: 100%;
width: 100px;
height: 9px;
background: #ccc;
overflow: hidden;
......@@ -444,6 +461,10 @@ pre.stats .zero {
-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
}
div.graphinline {
width: 100px;
display: inline-block;
}
.graph div {
display: block;
float: left;
......@@ -471,13 +492,19 @@ pre.stats .zero {
/* Download button */
.download_button {
padding: 3px 0 0 22px;
display: inline-block;
text-decoration: underline;
line-height: 20px;
background: transparent url(../img/download.png) no-repeat left;
}
/* Multi column lists */
.multi_column_list {
-moz-column-count: 3;
-webkit-column-count: 3;
column-count: 3;
}
.multi_column_list li {
border: 1px solid #ccc;
......@@ -491,9 +518,54 @@ pre.stats .zero {
border-radius: 3px;
}
.col3_column {
float: left;
width: 33.3%
}
.col3_container ul {
margin-top: 0;
list-style: none;
}
.col3_column li{
border: 1px solid #ccc;
background: #fff;
padding: 4px 8px;
list-style: none;
margin: 8px 5px;
-moz-box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.1);
-webkit-box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.1);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.col3_column li a{
text-decoration: none;
}
.col3_column li a:hover{
text-decoration: underline;
}
/* Person details */
/* Used in people/person_list */
.person_list {
padding-left: 65px;
margin-bottom: 12px;
clear: left;
}
.person_list .name {
font-size: 110%;
}
.person_list img {
height: 48px;
float: left;
margin-left: -65px;
}
.person_detail {
display: table-row;
}
......@@ -626,8 +698,8 @@ table.stats th.headerNoSort {
div.release_link {
float: right;
font-size:small;
margin: 54px 0 0 0;
font-size: small;
margin: 54px 5px 0 0;
}
div.uploaded_file {
float: right;
......@@ -641,16 +713,37 @@ div.face_image {
.right_actions {
float: right;
padding: 6px;
font-size: small;
font-weight: bold;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
border: 1px solid #eee;
padding: 5px 25px 0 0;
background: #7fa7d4;
background: #fff url(../newimg/html-bg.png) 0 repeat-x;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: inset 0 1px 3px -1px #396da9, 0 1px 0 #fff;
-webkit-box-shadow: inset 0 1px 3px -1px #396da9, 0 1px 0 #fff;
box-shadow: inset 0 1px 3px -1px #396da9;
}
.right_actions ul {
list-style: none;
}
.right_actions a {
text-decoration: none;
}
.right_actions a:hover {
text-decoration: underline;
}
div.docimages {
display: inline;
margin-left: 8px;
}
/* Vertimus action form*/
#action_form {
.diff_header,
.djform {
margin-top: 10px;
padding: 20px;
border: 1px solid #ccc;
......@@ -664,7 +757,7 @@ div.face_image {
-webkit-border-radius: 5px;
border-radius: 5px;
}
#action_form .djform textarea {
.djform textarea {
width: 100%;
min-height: 130px;
font: inherit;
......@@ -675,13 +768,14 @@ div.face_image {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
#action_form td {
.djform td {
padding: 3px 4px 0 0;
font-size: 12px;
color: #999;
color: #555753;
}
#action_form th {
.djform th {
vertical-align: top;
padding-right: 10px;
padding: 5px 10px 0 0;
text-align: left;
}
......@@ -741,6 +835,26 @@ img.screenshot {
border: 0;
}
p#show, p#hide {
text-align: right;
float:right;
}
/*show a foot logo instead of dots in some lists*/
ul.foot li {
list-style-image: url(../img/foot-16.png);
}
.about_qlinks{
text-align: left;
margin-left: 20px;
line-height: 0.9em;
}
.about_qlinks td a{
margin-left: 15px;
}
/* Footer */
/* ========================================================================== */
......
......@@ -4,7 +4,7 @@
{% block title %} {% trans "About" %} {% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h1>{% trans "About Damned Lies" %}</h1>
......@@ -23,15 +23,19 @@
{% endif %}
<h2>{% trans "Quick links" %}</h2>
<table>
<tr><th>{% trans "Project wiki" %}</th>
<td><a href="https://live.gnome.org/DamnedLies">https://live.gnome.org/DamnedLies</a></td></tr>
<tr><th>{% trans "Bug tracking page" %}</th>
<td><a href="https://bugzilla.gnome.org/browse.cgi?product=damned-lies">https://bugzilla.gnome.org/browse.cgi?product=damned-lies</td></tr>
<tr><th>{% trans "Source code" %}</th>
<td><a href="http://git.gnome.org/browse/damned-lies/">http://git.gnome.org/browse/damned-lies</td></tr>
<tr><th>{% trans "Workflow" %}</th>
<td><a href="http://l10n.gnome.org/help/vertimus_workflow/">http://l10n.gnome.org/help/vertimus_workflow</td></tr>
<table class="about_qlinks">
<tr><th><h4>{% trans "Project wiki" %}</h4></th>
<td><a href="https://live.gnome.org/DamnedLies">https://live.gnome.org/DamnedLies</a></td>
</tr>
<tr><th><h4>{% trans "Bug tracking page" %}</h4></th>
<td><a href="https://bugzilla.gnome.org/browse.cgi?product=damned-lies">https://bugzilla.gnome.org/browse.cgi?product=damned-lies</a></td>
</tr>
<tr><th><h4>{% trans "Source code" %}</h4></th>
<td><a href="http://git.gnome.org/browse/damned-lies/">http://git.gnome.org/browse/damned-lies</a></td>
</tr>
<tr><th><h4>{% trans "Workflow" %}</h4></th>
<td><a href="http://l10n.gnome.org/help/vertimus_workflow/">http://l10n.gnome.org/help/vertimus_workflow</a></td>
</tr>
</table>
</div>
......
......@@ -4,7 +4,7 @@
{% block title %}{% trans "GNOME Languages" %}{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h1>{% trans "GNOME Languages" %}</h1>
......@@ -12,8 +12,8 @@
{% plural %}GNOME is being translated to following {{ numb }} languages.
{% endblocktrans %}</p>
<ul class="multi_column_list">
<div class="col3_column">
<ul>
{% for lang in languages %}
<li>
<a href="{{ lang.get_team_url }}">{{ lang.get_name }}</a>
......@@ -23,7 +23,7 @@
</li>
{% endfor %}
</ul>
</div>
<p class="comment" style="clear:both">
{% blocktrans %}If anything should be changed on this page, please <a href="{{ bug_url }}">submit a bug report</a>.{% endblocktrans %}
</p>
......
......@@ -18,10 +18,14 @@ $(document).ready(function()
</script>{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h2>{% trans release.description %} - <a href="{{ language.get_team_url }}">{{ language_name }}</a></h2>
{% if release.status == "xternal" %}
<p><i>{% trans "The modules of this release are not part of the GNOME Git repository. Please check each module's web page to see where to send translations." %}</i></p>
{% endif %}
<p id="hide">
<a href="#" onclick="return showHideCompleted();">{% trans "Hide completed modules" %}</a>
</p>
......@@ -30,10 +34,6 @@ $(document).ready(function()
<a href="#" onclick="return showHideCompleted();">{% trans "Show completed modules" %}</a>
</p>
{% if release.status == "xternal" %}
<p><i>{% trans "The modules of this release are not part of the GNOME Git repository. Please check each module's web page to see where to send translations." %}</i></p>
{% endif %}
<h3>{{ stats_title }}</h3>
{% with stats as modstats %}
{% include "languages/language_release_stats.html" %}
......
......@@ -63,7 +63,7 @@
<img src="{{ err.get_icon }}" title="{{ err.get_description|striptags }}" alt="{{ err.type }}" />
{% endfor %}
{% if stat|domain_type == "mallard" %}
<img src="{{ MEDIA_URL }}img/mallard.png" width="18" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
<img style="margin-left: 1px;" src="{{ MEDIA_URL }}img/mallard.png" width="18" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
{% endif %}
</td>
<td><span class="branch">{{ branch }}</span></td>
......
......@@ -13,11 +13,11 @@
<p><a href="{{ module.homepage }}">{{ module.homepage }}</a></p>
{% endif %}
<form action="#" method="POST">
<form action="#" method="POST" class="djform">
<table>
<tr><th>{% trans "Branch" %}</th><th>{% trans "Release" %}</th><th>{% trans "Category" %}</th></tr>
<tr><td><h4>{% trans "Branch" %}</h4></td><td><h4>{% trans "Release" %}</h4></td><td><h4>{% trans "Category" %}</h4></td></tr>
{% for field1, field2 in form.get_branches %}
<tr><td>{{ field1.label }}</td><td>{{ field1 }}</td><td>{{ field2 }}</td></tr>
<tr><th>{{ field1.label }}</th><td>{{ field1 }}</td><td>{{ field2 }}</td></tr>
{% endfor %}
<tr><td>{{ form.new_branch }}</td><td>{{ form.new_branch_release }}</td><td>{{ form.new_branch_category }}</td></tr>
......
......@@ -16,7 +16,7 @@
{% list_to_columns modules as columns 3 %}
{% for l in columns %}
<div class="col3_column">
<ul class="foot">
<ul>
{% for m in l %}
<li><a href="{% url 'module' m.name %}">{{ m.get_description }}</a></li>
{% endfor %}
......
......@@ -23,13 +23,12 @@ $(document).ready(function()
<br clear="right" />
<div id="language_menu">
<form action="/i18n/setlang/" method="post">
{% trans "Site Language:" %}
<h2>{% trans "Site Language" %}</h2>
<select name="language">
{% for lang in all_languages %}
<option value="{{ lang.0 }}" {% if lang.0 == LANGUAGE_CODE %}selected="selected"{% endif %}>{{ lang.1 }}</option>
{% endfor %}
</select>
<br/>
</select>&nbsp;
<input type="submit" value="{% trans "Choose" %}" />
</form>
</div>
......
......@@ -4,7 +4,7 @@
{% block title %}{% trans "GNOME Contributors" %}{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h2>{% trans "GNOME Contributors" %}</h2>
<p>{% trans "GNOME is being developed by following people:" %}</p>
......@@ -31,4 +31,5 @@
</div>
{% endfor %}
</div>
</div>
{% endblock %}
......@@ -7,24 +7,24 @@
<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
<form action="" method="post">
<form action="" method="post" class="djform">
<table>
<tr>
<td colspan="2">{{ form.old_password.errors }}</td>
<tr>
<td><label for="id_old_password">{% trans 'Old password:' %}</label></td><td>{{ form.old_password }}</td>
<th><label for="id_old_password">{% trans 'Old password:' %}</label></th><td>{{ form.old_password }}</td>
</tr>
<tr>
<td colspan="2">{{ form.new_password1.errors }}</td>
</tr>
<tr>
<td><label for="id_new_password1">{% trans 'New password:' %}</label></td><td>{{ form.new_password1 }}</td>
<th><label for="id_new_password1">{% trans 'New password:' %}</label></th><td>{{ form.new_password1 }}</td>
</tr>
<tr>
<td colspan="2">{{ form.new_password2.errors }}</td>
</tr>
<tr>
<td><label for="id_new_password2">{% trans 'Confirm password:' %}</label></td><td>{{ form.new_password2 }}</td>
<th><label for="id_new_password2">{% trans 'Confirm password:' %}</label></th><td>{{ form.new_password2 }}</td>
</tr>
<tr>
<td></td><td><input type="submit" value="{% trans 'Change my password' %}" /></td>
......
......@@ -9,7 +9,7 @@
<h3>{% trans pot_stat.domain.get_description %}
{% if pot_stat|domain_type == "mallard" %}
<img src="{{ MEDIA_URL }}img/mallard.png" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/>
<span style="padding-top: 8px;" class="icon_button"><img src="{{ MEDIA_URL }}img/mallard.png" title="{% trans "This document is written in Mallard documentation format" %}" alt="mallard icon"/></span>
{% endif %}
{% if pot_stat.full_po %}
......
......@@ -34,7 +34,7 @@ $(document).ready(function() {
{% block title %}{{ team.get_description }}{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
{% if not team.fake %}
......@@ -66,7 +66,7 @@ $(document).ready(function() {
{% endwith %}
{% if user.is_authenticated %}
<div class="float_right"><a href="{% url 'activity_by_language' lang.locale %}">{% trans "Current activities" %}</a></div>
<div class="right"><a href="{% url 'activity_by_language' lang.locale %}">{% trans "Current activities" %}</a></div>
{% endif %}
<p><strong>{% trans "Plural forms:" %}</strong> {{ lang.get_plurals }}</p>
......
......@@ -12,10 +12,10 @@ $(document).ready(function() {
{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h1>{% blocktrans with team.get_description as lang %}{{ lang }} Translation Team{% endblocktrans %}</h1>
<form action="#" method="POST">
<form action="#" method="POST" class="djform">
<table>
{% if form.coordinatorship %}
<tr><th>{{ form.coordinatorship.label }}:</th>
......
......@@ -22,11 +22,11 @@ $(document).ready(function()
{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h1>{% blocktrans with lang=language.name url=language.get_team_url %}Activity summary for <a href="{{ url }}">{{ lang }}</a>{% endblocktrans %}</h1>
<table class="tablesorter" id="summary">
<table class="stats" id="summary">
<thead><tr>
<th>{% trans "Date" %}</th><th>{% trans "Module" %}</th><th>{% trans "State" %}</th>
</tr></thead>
......
......@@ -20,7 +20,7 @@ $(document).ready(function() {
{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
{% if action_form.non_field_errors %}
{{ action_form.non_field_errors }}
{% endif %}
......@@ -28,7 +28,7 @@ $(document).ready(function() {
{% with branch.releases.all as releases %}
<div class="release_link">
{% if releases %}
<p><em>{% trans "Used in release(s):" %}</em><br />
<p><h4>{% trans "Used in release(s):" %}</h4>
{% for release in releases %}
<a href="{% url 'language_release' language.locale release.name domain.dtype %}">
{% trans release.description %}
......@@ -61,26 +61,37 @@ $(document).ready(function() {
{% endif %}
<div id="vertimus_stats">
<div><em><a href="{{ pot_stats.pot_url }}">
<div><em><a href="{{ pot_stats.pot_url }}">
<img src="{{ MEDIA_URL }}img/download.png" alt="{% trans "Download POT file" %}" /></a>
{{ pot_stats.pot_text }}
</em></div>
<div style="display: inline-block">
<div style="display: inline-block;">
<a href="{{ po_url }}"><img src="{{ MEDIA_URL }}img/download.png" alt="{% trans "Download PO file" %}" /></a>
{% trans "PO file statistics:" %} <br />
<div id="stats_po">
<div title="{% trans "Translated/Fuzzy/Untranslated" %}">
{% trans "Strings:" %} {{ stats|num_stats:"full" }}&nbsp;
<div class="graph graphinline">
<span>{% trans "Strings:" %} {{ stats|num_stats:"full" }}</span>&nbsp;
<div class="graph graphinline">
{{ stats|vis_stats:"full" }}
</div>
{% trans "Words:" %} {{ stats|num_word_stats:"full" }}&nbsp;
<div class="graph graphinline">
</div>
<span style="margin-left: 15px;">{% trans "Words:" %} {{ stats|num_word_stats:"full" }}</span>&nbsp;
<div class="graph graphinline">
{{ stats|vis_word_stats:"full" }}
</div>
</div>
</div>
{% if fig_stats and stats.language %}
<div class="docimages">
{% url 'docimages' module.name stats.domain.name branch.name stats.language.locale as img_url %}
{% blocktrans with stats=fig_stats|num_stats count total=fig_stats.total %} including <a href="{{ img_url }}">{{ stats }} image</a>{% plural %} including <a href="{{ img_url }}">{{ stats }} images</a>{% endblocktrans %}
</div>
{% endif %}
</div>
</div>
</div> <!-- end of div.vertimus_stats -->
<div class="clear"></div>
{% if po_url_reduced %}
<div style="display: inline-block;">
<div style="display: inline-block; margin: 20px 0 5px 0;">
<a href="{{ po_url_reduced }}"><img src="{{ MEDIA_URL }}img/download.png" alt="{% trans "Download PO file" %}" /></a>
{% trans "PO file statistics (reduced):" %}
<div style="display: inline-block;">
......@@ -89,20 +100,18 @@ $(document).ready(function() {
</a></span>
</div>
<br />
{% trans "Strings:" %} {{ stats|num_stats:"part" }}&nbsp;
<div class="graph graphinline">
{{ stats|vis_stats:"part" }}
</div>
{% trans "Words:" %} {{ stats|num_word_stats:"part" }}&nbsp;
<div class="graph graphinline">
{{ stats|vis_word_stats:"part" }}
</div>
</div>
{% endif %}
{% if fig_stats and stats.language %}
<div class="docimages">
{% url 'docimages' module.name stats.domain.name branch.name stats.language.locale as img_url %}
{% blocktrans with stats=fig_stats|num_stats count total=fig_stats.total %} including <a href="{{ img_url }}">{{ stats }} image</a>{% plural %} including <a href="{{ img_url }}">{{ stats }} images</a>{% endblocktrans %}
<div id="stats_po">
<div title="{% trans "Translated/Fuzzy/Untranslated" %}">
<span>{% trans "Strings:" %} {{ stats|num_stats:"full" }}</span>&nbsp;
<div class="graph graphinline">
{{ stats|vis_stats:"full" }}
</div>
<span style="margin-left: 15px;">{% trans "Words:" %} {{ stats|num_word_stats:"full" }}</span>&nbsp;
<div class="graph graphinline">
{{ stats|vis_word_stats:"full" }}
</div>
</div>
</div>
</div>
{% endif %}
</div>
......@@ -120,7 +129,7 @@ $(document).ready(function() {
{% endif %}
{% if other_states %}
<div style="margin-top:0.5em; clear: both;">
<div style="margin-top:1.2em; clear: both;">
<img src="{{ MEDIA_URL }}img/warn.png" alt="Warning logo" />
{% trans "On-going activities in same module:" %}
{% for st in other_states %}
......@@ -163,7 +172,7 @@ $(document).ready(function() {
<div class="vertimus_action_content">
<div class="face_image">
{% if action.person.image %}<img src="{{ action.person.image }}" alt="face" style="max-height: 50px;"/>
{% else %}<img src="{{ MEDIA_URL }}img/nobody-16.png" alt="Person"/>
{% else %}<img src="{{ MEDIA_URL }}img/nobody.png" alt="Person"/>
{% endif %}
</div>
{% if action.file %}
......@@ -209,7 +218,7 @@ $(document).ready(function() {
{% if action_form %}
<form enctype="multipart/form-data"
action="{% url 'vertimus_by_stats_id' stats.id language.id %}"
method="POST" id="action_form">
method="POST" class="djform">
<script type="text/javascript">
var send_mail_defaults = Array();
{% for action in action_form.actions %}
......@@ -217,7 +226,7 @@ $(document).ready(function() {
{% endfor %}
</script>
<table class="djform">
<table>
{{ action_form.action|as_tr }}
{{ action_form.comment|as_tr }}
{{ action_form.file|as_tr }}
......
......@@ -11,12 +11,13 @@
{% endblock %}
{% block content %}
<div class="mainpage">
<div class="maxwidth">
<h1>{{ state.branch.module.get_description }} - {{ state.branch.name }} - {{ state.domain.get_description }} - {{ state.language.get_name }}</h1>
<h1>{{ state.branch.module.get_description }} - <span style="color:#000;">{{ state.branch.name }}</span> - {{ state.domain.get_description }} - {{ state.language.get_name }}</h1>
<p><a href="{% url 'vertimus_by_names' state.branch.module.name state.branch.name state.domain.name state.language.locale %}">{% trans "&lt;- Back to actions" %}</a></p>
{{ diff_content|safe }}
<p><em>{% trans "Note: both files are merged with latest POT file." %}</em></p>
</div>
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment