diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 19:29:00 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 19:29:00 -0400 |
commit | ca9e5e41f43a8430f4b282bfddf2dcf3ba2c3d7c (patch) | |
tree | d662eaaec049edd26bda8091b31c22edc340e18a /templates/base.html | |
parent | 16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (diff) | |
parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) |
Merge commit '91c451'
Conflicts:
devel/views.py
feeds.py
local_settings.py.example
packages/management/commands/signoff_report.py
packages/views/flag.py
public/views.py
templates/404.html
templates/base.html
templates/devel/clock.html
templates/devel/index.html
templates/devel/packages.html
templates/devel/profile.html
templates/general_form.html
templates/mirrors/mirror_details.html
templates/mirrors/mirrorlist.txt
templates/mirrors/mirrorlist_generate.html
templates/mirrors/mirrorlist_status.txt
templates/mirrors/mirrors.html
templates/mirrors/status.html
templates/news/add.html
templates/news/delete.html
templates/news/list.html
templates/news/view.html
templates/packages/details.html
templates/packages/differences.html
templates/packages/files.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/flaghelp.html
templates/packages/groups.html
templates/packages/opensearch.xml
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoff_options.html
templates/packages/signoffs.html
templates/packages/stale_relations.html
templates/public/about.html
templates/public/art.html
templates/public/blank.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/public/keys.html
templates/public/svn.html
templates/public/userlist.html
templates/registration/login.html
templates/registration/logout.html
templates/releng/add.html
templates/releng/results.html
templates/releng/thanks.html
templates/todolists/list.html
templates/todolists/public_list.html
templates/todolists/todolist_confirm_delete.html
templates/todolists/view.html
templates/visualize/index.html
todolists/views.py
Diffstat (limited to 'templates/base.html')
-rw-r--r-- | templates/base.html | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/templates/base.html b/templates/base.html index 6f4c73f5..54e38058 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,26 +1,29 @@ -{% load url from future %}{% load static from staticfiles %}<!DOCTYPE html> +{% load url from future %}{% load static from staticfiles %}{% load wiki %}<!DOCTYPE html> <html lang="en"> <head> - <title>{% block title %}Parabola GNU/Linux-libre{% endblock %}</title> + <title>{% block title %}{{ BRANDING_DISTRONAME }}{% endblock %}</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="{% static "archweb.css" %}" media="screen, projection" /> <link rel="stylesheet" type="text/css" href="{% static "archweb-print.css" %}" media="print" /> <link rel="icon" type="image/x-icon" href="{% static "favicon.ico" %}" /> <link rel="shortcut icon" type="image/x-icon" href="{% static "favicon.ico" %}" /> - <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="Parabola Packages" /> + <link rel="apple-touch-icon" href="{% static "logos/apple-touch-icon-57x57.png" %}" /> + <link rel="apple-touch-icon" sizes="72x72" href="{% static "logos/apple-touch-icon-72x72.png" %}" /> + <link rel="apple-touch-icon" sizes="114x114" href="{% static "logos/apple-touch-icon-114x114.png" %}" /> + <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="{{ BRANDING_DISTRONAME }} Packages" /> {% block head %}{% endblock %} </head> <body class="{% if user.is_authenticated %}devmode {% endif %}{% block bodyclass %}{% endblock %}"> <div id="archnavbar" class="{% block navbarclass %}anb-home{% endblock %}"> - <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Parabola</a></h1></div> + <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">{{ BRANDING_DISTRONAME }}</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> - <li id="anb-home"><a href="/" title="Parabola news, packages, projects and more">Home</a></li> - <li id="anb-packages"><a href="/packages/" title="Package Database">Packages</a></li> - <li id="anb-wiki"><a href="https://wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li> - <li id="anb-bugs"><a href="https://labs.parabola.nu" title="Issue Tracker">Bugs</a></li> + <li id="anb-home"><a href="/" title="{{ BRANDING_SHORTNAME }} news, packages, projects and more">Home</a></li> + <li id="anb-packages"><a href="/packages/" title="{{ BRANDING_SHORTNAME }} Package Database">Packages</a></li> + <li id="anb-wiki"><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li> + <li id="anb-bugs"><a href="{{ BUGTRACKER_URL }}" title="Report and track bugs">Bugs</a></li> <li id="anb-projects"><a href="https://projects.parabolagnulinux.org" title="Our Code">Projects</a></li> - <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get Parabola">Download</a></li> + <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li> </ul> </div> </div> @@ -29,13 +32,13 @@ {% if user.is_authenticated %} <ul> <li><a href="{% url 'devel-index' %}" title="Developer Dashboard">Dashboard</a></li> - <li><a href="https://wiki.parabolagnulinux.org/DeveloperWiki" + <li><a href="{% wiki_url 'DeveloperWiki' %}" title="Developer Wiki">DevWiki</a></li> <li><a href="{% url 'news-list' as newsl %}{{ newsl }}" title="Manage news articles">News</a></li> <li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li> <li><a href="/todo/" title="Developer todo lists">Todos</a></li> <li><a href="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li> - <li><a href="https://lists.parabolagnulinux.org/pipermail/dev/" + <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/dev/" title="dev mailing list archives">Archives</a></li> <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li> {% if user.is_staff %} @@ -65,9 +68,13 @@ {% endblock %} <div id="footer"> <p>Copyleft 2009-{% now "Y" %} Parabola Project. All content is - released under a <a - href="http://creativecommons.org/licenses/by-sa/3.0/" - rel="license">cc-by-sa 3.0 unported</a> license.</p> + released under the <a + href="http://creativecommons.org/licenses/by-sa/3.0/" + rel="license">cc by-sa 3.0 unported</a> license.</p> + <p>Website software and layout is derivative of archweb, + Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" + title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" + title="Contact Aaron Griffin">Aaron Griffin</a>.</p> </div> </div> </body> |