diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
commit | 988c2c6d400b3721464c2891891807d504b076b0 (patch) | |
tree | 013dc3d676edad701d0d3bbd239bc2df0cdf76b4 /templates/base.html | |
parent | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (diff) | |
parent | 183c4d9cefa95f46c3fa3a6936f837542426eac2 (diff) |
Merge branch 'master' of ssh://gparabola/parabolaweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/search.html
templates/public/download.html
templates/todolists/view.html
Diffstat (limited to 'templates/base.html')
-rw-r--r-- | templates/base.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/templates/base.html b/templates/base.html index ca492281..746c6cf4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -19,10 +19,10 @@ <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="http://wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li> - <li id="anb-bugs"><a href="https://bugs.parabolagnulinux.org" title="Issue Tracker">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="http://wiki.parabolagnulinux.org/Download" title="Get Parabola">Download</a></li> + <li id="anb-wiki"><a href="//wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li> + <li id="anb-bugs"><a href="//bugs.parabolagnulinux.org" title="Issue Tracker">Bugs</a></li> + <li id="anb-projects"><a href="//projects.parabolagnulinux.org" title="Our Code">Projects</a></li> + <li id="anb-download"><a href="//wiki.parabolagnulinux.org/Download" title="Get Parabola">Download</a></li> </ul> </div> </div><!-- #archnavbar --> @@ -32,14 +32,14 @@ {% if user.is_authenticated %} <ul> <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li> - <li><a href="https://projects.parabolagnulinux.org/" title="Git Projects">Projects</a></li> + <li><a href="//projects.parabolagnulinux.org/" title="Git Projects">Projects</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="/packages/differences/" title="Package architecture differences">Architecture Differences</a></li> <li><a - href="http://list.parabolagnulinux.org/pipermail/dev-parabolagnulinux.org/" + href="//lists.parabolagnulinux.org/pipermail/dev/" title="dev mailing list archives">Archives</a></li> <li><a href="/devel/clock/" title="Developer world clocks">Dev Clocks</a></li> {% if user.is_staff %} |