summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--local_settings.py.example22
-rw-r--r--main/context_processors.py7
-rw-r--r--releng/views.py2
-rw-r--r--settings.py6
-rw-r--r--templates/public/index.html14
-rw-r--r--visualize/static/visualize.js20
6 files changed, 57 insertions, 14 deletions
diff --git a/local_settings.py.example b/local_settings.py.example
index 4be1e2e9..52eab33c 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -1,9 +1,9 @@
### Django settings for archlinux project.
## Debug settings
-DEBUG = False
+DEBUG = False # If you are running without another HTTP server, must be true
TEMPLATE_DEBUG = False
-#DEBUG_TOOLBAR = True
+DEBUG_TOOLBAR = False # Must install package django-debug-toolbar to use
## For django debug toolbar
INTERNAL_IPS = ('127.0.0.1',)
@@ -25,6 +25,20 @@ ADMINS = (
# },
#}
+## MySQL Database settings
+#DATABASES = {
+# 'default': {
+# 'ENGINE' : 'django.db.backends.mysql',
+# 'NAME' : 'archlinux',
+# 'USER' : 'archlinux',
+# 'PASSWORD': 'archlinux',
+# 'HOST' : '',
+# 'PORT' : '',
+# # InnoDB WILL NOT work
+# 'OPTIONS' : {'init_command': 'SET storage_engine=MyISAM'},
+# },
+#}
+
## Sqlite Database settings
DATABASES = {
'default': {
@@ -50,10 +64,10 @@ CACHE_MIDDLEWARE_SECONDS = 300
SESSION_COOKIE_SECURE = False
## location for saving dev pictures (the 'devs' folder should be inside of this)
-MEDIA_ROOT = '/srv/example.com/img/'
+MEDIA_ROOT = '/srv/http/web-uploads'
## web url for serving image files (the 'devs' folder should be inside of this)
-MEDIA_URL = '/media/img/'
+MEDIA_URL = '/img/'
## Make this unique, and don't share it with anybody.
SECRET_KEY = '00000000000000000000000000000000000000000000000'
diff --git a/main/context_processors.py b/main/context_processors.py
index 2543a3de..df9f1633 100644
--- a/main/context_processors.py
+++ b/main/context_processors.py
@@ -4,13 +4,16 @@ def secure(request):
def branding(request):
from django.conf import settings
return {
+ 'BUGTRACKER_URL': settings.BUGTRACKER_URL,
+ 'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL,
+ 'PROJECTS_URL': settings.BUGTRACKER_URL,
+
'BRANDING_APPNAME': settings.BRANDING_APPNAME,
'BRANDING_DISTRONAME': settings.BRANDING_DISTRONAME,
'BRANDING_SHORTNAME': settings.BRANDING_SHORTNAME,
'BRANDING_WIKINAME': settings.BRANDING_WIKINAME,
'BRANDING_EMAIL': settings.BRANDING_EMAIL,
- 'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL,
- 'BUGTRACKER_URL': settings.BUGTRACKER_URL,
+ 'BRANDING_OSEARCH_TAGS': settings.BRANDING_OSEARCH_TAGS,
}
# vim: set ts=4 sw=4 et:
diff --git a/releng/views.py b/releng/views.py
index b1c76a4a..ca0a7dd2 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -50,7 +50,7 @@ class TestForm(forms.ModelForm):
success = forms.BooleanField(
help_text="Only check this if everything went fine. "
"If you ran into problems please create a ticket on <a "
- "href=\"https://bugs.archlinux.org/index.php?project=6\">the "
+ "href=\""+settings.BUGTRACKER_RELENG_URL+"\">the "
"bugtracker</a> (or check that one already exists) and link to "
"it in the comments.",
required=False)
diff --git a/settings.py b/settings.py
index 1cb85fc1..0bdc3162 100644
--- a/settings.py
+++ b/settings.py
@@ -171,6 +171,11 @@ MAILMAN_BASE_URL = 'https://mailman.archlinux.org/'
# URL for linking to the bugtracker
BUGTRACKER_URL = 'https://bugs.archlinux.org/'
+# URL for linking to the release engineering/iso project on the bugtracker
+BUGTRACKER_RELENG_URL = 'https://bugs.archlinux.org/index.php?project=6'
+
+PROJECTS_URL = 'https://projects.archlinux.org'
+
# Trackers used for ISO download magnet links
TORRENT_TRACKERS = (
'udp://tracker.archlinux.org:6969',
@@ -184,6 +189,7 @@ BRANDING_DISTRONAME = 'Arch Linux'
BRANDING_SHORTNAME = 'Arch'
BRANDING_WIKINAME = 'ArchWiki'
BRANDING_EMAIL = 'Arch Website Notification <nobody@archlinux.org>'
+BRANDING_OSEARCH_TAGS = 'linux archlinux package software'
## Import local settings
from local_settings import *
diff --git a/templates/public/index.html b/templates/public/index.html
index b32260b5..cdcde695 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -13,7 +13,7 @@
<div id="intro" class="box">
<h2>A simple, lightweight distribution</h2>
- <p>You've reached the website for <strong>Arch Linux</strong>, a
+ <p>You've reached the website for <strong>{{BRANDING_DISTRONAME}}</strong>, a
lightweight and flexible Linux® distribution that tries to Keep It
Simple.</p>
@@ -27,10 +27,10 @@
on the range of skillsets and uses for Arch that stem from it. Please
check out our <a href="https://bbs.archlinux.org/" title="Arch Forums">forums</a>
and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
- title="Arch Mailing Lists">mailing lists</a>
+ title="{{ BRANDING_SHORTNAME }} Mailing Lists">mailing lists</a>
to get your feet wet. Also glance through our <a href="{% wiki_url %}"
title="{{BRANDING_WIKINAME}}">wiki</a>
- if you want to learn more about Arch.</p>
+ if you want to learn more about {{BRANDING_SHORTNAME}}.</p>
<p class="readmore"><a href="{% url 'page-about' %}"
title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>
@@ -115,7 +115,7 @@
title="Community documentation">Wiki</a></li>
<li><a href="{% wiki_url 'Installation Guide' %}"
title="Official installation guide">Official Installation Guide</a></li>
- <li><a href="%{ wiki_url "Beginners'_Guide" %}"
+ <li><a href="{% wiki_url "Beginners'_Guide" %}"
title="A good place to start for beginners">Unofficial Beginners' Guide</a></li>
</ul>
@@ -161,8 +161,8 @@
<h4>Development</h4>
<ul>
- <li><a href="https://projects.archlinux.org/"
- title="Official Arch projects (git)">Projects in Git</a></li>
+ <li><a href="{{ PROJECTS_URL }}"
+ title="Official {{BRANDING_SHORTNAME}} projects (git)">Projects in Git</a></li>
<li><a href="{% url 'page-svn' %}"
title="View SVN entries for packages">SVN Repositories</a></li>
<li><a href="{% wiki_url 'DeveloperWiki' %}"
@@ -181,7 +181,7 @@
<li><a href="{% url 'page-keys' %}"
title="Package/Database signing master keys">Signing Master Keys</a></li>
<li><a href="{% wiki_url 'Arch_Linux_Press_Review' %}"
- title="Arch Linux in the media">Press Coverage</a></li>
+ title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li>
<li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
<li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
<li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
diff --git a/visualize/static/visualize.js b/visualize/static/visualize.js
index 5004fe6c..ff39bb96 100644
--- a/visualize/static/visualize.js
+++ b/visualize/static/visualize.js
@@ -1,3 +1,23 @@
+/* archweb.js
+ * Homepage: https://projects.archlinux.org/archweb.git/
+ * Copyright: 2011 Dan McGee
+ * License: GPLv2
+ *
+ * This file is part of Archweb.
+ *
+ * Archweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Archweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Archweb. If not, see <http://www.gnu.org/licenses/>.
+ */
+
function packages_treemap(chart_id, orderings, default_order) {
var jq_div = jQuery(chart_id),
color = d3.scale.category20();