diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 02:50:22 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 02:50:22 -0400 |
commit | d2eb47c0dfc068c7727232d89daeee377969288d (patch) | |
tree | a28b938c1eef550a5a0d21fdab0b1fef41d4ffd3 /templates | |
parent | 4da7072d827b6cc2cd3aeae908b221b58738f364 (diff) | |
parent | c8d979b8a48805d162ab46cdc4e493da0aa1595c (diff) |
Merge branch 'archweb-generic'
Diffstat (limited to 'templates')
-rw-r--r-- | templates/mirrors/error_table.html.jinja | 8 | ||||
-rw-r--r-- | templates/mirrors/url_details_logs.html.jinja | 4 | ||||
-rw-r--r-- | templates/packages/details.html.jinja | 4 | ||||
-rw-r--r-- | templates/packages/details_depend.html.jinja | 6 | ||||
-rw-r--r-- | templates/packages/details_relatedto.html.jinja | 2 | ||||
-rw-r--r-- | templates/packages/files_list.html.jinja | 2 | ||||
-rw-r--r-- | templates/registration/login.html | 10 | ||||
-rw-r--r-- | templates/registration/logout.html | 5 |
8 files changed, 19 insertions, 22 deletions
diff --git a/templates/mirrors/error_table.html.jinja b/templates/mirrors/error_table.html.jinja index 52f68135..132aae63 100644 --- a/templates/mirrors/error_table.html.jinja +++ b/templates/mirrors/error_table.html.jinja @@ -7,16 +7,18 @@ <th>Error Message</th> <th>Last Occurred</th> <th>Occurrences (last {{ cutoff|hours }})</th> + <th></th> </tr> </thead> <tbody> {% for log in error_logs %}<tr class="{{ loop.cycle('odd', 'even') }}"> - <td>{{ log.url__url }}</td> - <td>{{ log.url__protocol__protocol }}</td> - <td class="country">{{ country_flag(log.country) }}{{ log.country.name }}</td> + <td>{{ log.url.url }}</td> + <td>{{ log.url.protocol.protocol }}</td> + <td class="country">{{ country_flag(log.url.country) }}{{ log.url.country.name }}</td> <td class="wrap">{{ log.error|linebreaksbr }}</td> <td>{{ log.last_occurred|date('Y-m-d H:i') }}</td> <td>{{ log.error_count }}</td> + <td><a href="{{ log.url.get_absolute_url() }}">details</a></td> </tr>{% endfor %} </tbody> </table> diff --git a/templates/mirrors/url_details_logs.html.jinja b/templates/mirrors/url_details_logs.html.jinja index 58f179d8..51f54931 100644 --- a/templates/mirrors/url_details_logs.html.jinja +++ b/templates/mirrors/url_details_logs.html.jinja @@ -14,8 +14,8 @@ <tbody> {% for log in logs %}<tr class="{{ loop.cycle('odd', 'even') }}"> <td>{{ log.check_time|date('Y-m-d H:i') }}</td> - <td class="country">{{ country_flag(log.location.country) }}{{ log.location.country.name }}</td> - <td>{{ log.location.source_ip }}</td> + <td class="country">{% if log.location %}{{ country_flag(log.location.country) }}{{ log.location.country.name }}{% else %}Unknown{% endif %}</td> + <td>{% if log.location %}{{ log.location.source_ip }}{% else %}Unknown{% endif %}</td> <td>{{ log.last_sync|date('Y-m-d H:i') }}</td> <td>{{ log.delay|duration }}</td> <td>{{ log.duration|floatvalue }}</td> diff --git a/templates/packages/details.html.jinja b/templates/packages/details.html.jinja index 22c778cb..047bd8f6 100644 --- a/templates/packages/details.html.jinja +++ b/templates/packages/details.html.jinja @@ -108,7 +108,7 @@ {% endif %} <tr> <th>Description:</th> - <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default("") }}</td> + <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default("", true) }}</td> </tr><tr> <th>Upstream URL:</th> <td>{% if pkg.url %}<a itemprop="url" href="{{ pkg.url }}" @@ -191,7 +191,7 @@ {% if user.is_authenticated() %}{% with flag_request = pkg.flag_request() %}{% if flag_request %}<tr> <th>Last Flag Request:</th> <td class="wrap">From {{ flag_request.who() }} on {{ flag_request.created|date }}:<br/> - <div class="userdata">{{ flag_request.message|linebreaksbr|default("{no message}") }}</div></td> + <div class="userdata">{{ flag_request.message|linebreaksbr|default("{no message}", true) }}</div></td> </tr>{% endif %}{% endwith %}{% endif %} </table> </div> diff --git a/templates/packages/details_depend.html.jinja b/templates/packages/details_depend.html.jinja index 404793b6..a2d3a010 100644 --- a/templates/packages/details_depend.html.jinja +++ b/templates/packages/details_depend.html.jinja @@ -1,8 +1,8 @@ {% import 'packages/details_link.html.jinja' as details %}<li>{% if depend.pkg == None %} -{% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default("") }}{{ depend.dep.version|default("") }} <span class="virtual-dep">({% for pkg in depend.providers %}{{ details.details_link(pkg) }}{% if not loop.last %}, {% endif %}{% endfor %})</span> -{% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default("") }}{{ depend.dep.version|default("") }} <span class="virtual-dep">(virtual)</span> +{% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default("", true) }}{{ depend.dep.version|default("", true) }} <span class="virtual-dep">({% for pkg in depend.providers %}{{ details.details_link(pkg) }}{% if not loop.last %}, {% endif %}{% endfor %})</span> +{% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default("", true) }}{{ depend.dep.version|default("", true) }} <span class="virtual-dep">(virtual)</span> {% endif %}{% else %} -{{ details.details_link(depend.pkg) }}{{ depend.dep.comparison|default("") }}{{ depend.dep.version|default("") }} +{{ details.details_link(depend.pkg) }}{{ depend.dep.comparison|default("", true) }}{{ depend.dep.version|default("", true) }} {% if depend.pkg.repo.testing %} <span class="testing-dep"> (testing)</span> {% endif %}{% if depend.pkg.repo.staging %} <span class="staging-dep"> (staging)</span> {% endif %}{% endif %} diff --git a/templates/packages/details_relatedto.html.jinja b/templates/packages/details_relatedto.html.jinja index 955fdd37..818224de 100644 --- a/templates/packages/details_relatedto.html.jinja +++ b/templates/packages/details_relatedto.html.jinja @@ -1,3 +1,3 @@ {% import 'packages/details_link.html.jinja' as details %}{% for related in all_related %}{% with best_satisfier = related.get_best_satisfier() %} -<span class="related">{% if best_satisfier == None %}{{ related.name }}{% else %}{{ details.details_link(best_satisfier) }}{% endif %}{{ related.comparison|default("") }}{{ related.version|default("") }}{% if not loop.last %}, {% endif %}</span> +<span class="related">{% if best_satisfier == None %}{{ related.name }}{% else %}{{ details.details_link(best_satisfier) }}{% endif %}{{ related.comparison|default('', true) }}{{ related.version|default('', true) }}{% if not loop.last %}, {% endif %}</span> {% endwith %}{% endfor %} diff --git a/templates/packages/files_list.html.jinja b/templates/packages/files_list.html.jinja index c8fc3b1a..ab3e1210 100644 --- a/templates/packages/files_list.html.jinja +++ b/templates/packages/files_list.html.jinja @@ -6,7 +6,7 @@ of the package; it may be out of date.</p> {% if files|length %} <ul> {% for file in files %} -<li class="{% if file.is_directory %}d{% else %}f{% endif %}">{{ file.directory }}{{ file.filename|default('') }}</li>{% endfor %} +<li class="{% if file.is_directory %}d{% else %}f{% endif %}">{{ file.directory }}{{ file.filename|default('', true) }}</li>{% endfor %} </ul> {% else %} <p class="message">Package has no files.</p> diff --git a/templates/registration/login.html b/templates/registration/login.html index c722527d..ff360de3 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -5,21 +5,15 @@ {% block content %} <div id="dev-login" class="box"> - <h2>Developer Login</h2> - {% if form.has_errors %} - <p class="login-error">Your username and password didn't match. Please try again.</p> - {% endif %} - <form id="dev-login-form" method="post">{% csrf_token %} <fieldset> - <legend>Enter login credentials</legend> + <legend>Please enter your credentials to login.</legend> {{ form.as_p }} - <p><label></label> <input type="submit" value="Login" /></p> + <p><label></label><input type="submit" value="Login"/></p> </fieldset> </form> - </div> {% endblock %} diff --git a/templates/registration/logout.html b/templates/registration/logout.html index 71daa2e8..5c296c5d 100644 --- a/templates/registration/logout.html +++ b/templates/registration/logout.html @@ -1,11 +1,12 @@ {% extends "base.html" %} + {% block title %}{{ BRANDING_DISTRONAME }} - Logout successful{% endblock %} {% block content %} <div id="dev-logout" class="box"> <h2>Developer Logout</h2> - <p>Logout was successful.<p> + <p>Logout was successful. + <a href='{% url 'login' %}'>Click here to login again.</a></p> </div> {% endblock %} - |