[SCM] Code for the Debian Games Parties branch, master, updated. b68fdcac30eefbbaaa18ef8ef88d7585851ba482
Paul Wise
pabs at debian.org
Fri Jul 30 20:02:31 UTC 2010
The following commit has been merged in the master branch:
commit b68fdcac30eefbbaaa18ef8ef88d7585851ba482
Author: Paul Wise <pabs at debian.org>
Date: Fri Jul 30 16:02:16 2010 -0400
Fix indentation and whitespace
diff --git a/manage.py b/manage.py
index bcdd55e..0423776 100755
--- a/manage.py
+++ b/manage.py
@@ -1,11 +1,11 @@
#!/usr/bin/python
from django.core.management import execute_manager
try:
- import settings # Assumed to be in the same directory.
+ import settings # Assumed to be in the same directory.
except ImportError:
- import sys
- sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
- sys.exit(1)
+ import sys
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+ sys.exit(1)
if __name__ == "__main__":
- execute_manager(settings)
+ execute_manager(settings)
diff --git a/screenshots/templates/index.html b/screenshots/templates/index.html
index 5dacac8..a520826 100644
--- a/screenshots/templates/index.html
+++ b/screenshots/templates/index.html
@@ -24,11 +24,11 @@
<span class="current">
Page {{ pagination.number }} of
- {% if pagination.has_next %}
- <a href="{% url parties.screenshots.views.index pagination.paginator.num_pages %}">{{ pagination.paginator.num_pages }}</a>
- {% else %}
- <span class="disabled">{{ pagination.paginator.num_pages }}</span>
- {% endif %}
+ {% if pagination.has_next %}
+ <a href="{% url parties.screenshots.views.index pagination.paginator.num_pages %}">{{ pagination.paginator.num_pages }}</a>
+ {% else %}
+ <span class="disabled">{{ pagination.paginator.num_pages }}</span>
+ {% endif %}
</span>
{% if pagination.has_next %}
@@ -64,20 +64,20 @@
<a href="{{ s.large_url }}" title="{{ p.name }} {{ s.version }} screenshot">
<img src="{{ s.small_url }}" border="0">
</a>
- {% if p.claim_nick %}{% ifequal p.claim_nick irc_nick %}
- <form action="{% url parties.screenshots.views.request_removal %}" method="post">
- <input type="submit" value="Request removal"/>
- <input type="hidden" name="irc_nick" value="{{ irc_nick }}"/>
- <input type="hidden" name="page" value="{{ pagination.number }}"/>
- <input type="hidden" name="package" value="{{ p.name }}"/>
- <input type="hidden" name="screenshot" value="{{ s.id }}"/>
- </form>
- {% endifequal %}{% endif %}
+ {% if p.claim_nick %}{% ifequal p.claim_nick irc_nick %}
+ <form action="{% url parties.screenshots.views.request_removal %}" method="post">
+ <input type="submit" value="Request removal"/>
+ <input type="hidden" name="irc_nick" value="{{ irc_nick }}"/>
+ <input type="hidden" name="page" value="{{ pagination.number }}"/>
+ <input type="hidden" name="package" value="{{ p.name }}"/>
+ <input type="hidden" name="screenshot" value="{{ s.id }}"/>
+ </form>
+ {% endifequal %}{% endif %}
</div>
{% endfor %}
{% endif %}
{% if irc_nick %}
- <div class="package-actions">
+ <div class="package-actions">
{% if p.claim_nick %}{% ifequal p.claim_nick irc_nick %}
<form action="{% url parties.screenshots.views.unclaim %}" method="post">
<input type="submit" value="Drop claim"/>
@@ -89,8 +89,8 @@
<input type="hidden" name="irc_nick" value="{{ irc_nick }}"/>
<input type="hidden" name="page" value="{{ pagination.number }}"/>
<input type="hidden" name="package" value="{{ p.name }}"/>
- <input type="file" name="file" size="10"/>
- <input type="text" name="version" value="{{ p.version }}" size="13"/> (version)
+ <input type="file" name="file" size="10"/>
+ <input type="text" name="version" value="{{ p.version }}" size="13"/> (version)
<input type="submit" value="Add screenshot"/>
</form>
{% endifequal %}{% endif %}
@@ -127,11 +127,11 @@
<span class="current">
Page {{ pagination.number }} of
- {% if pagination.has_next %}
- <a href="{% url parties.screenshots.views.index pagination.paginator.num_pages %}">{{ pagination.paginator.num_pages }}</a>
- {% else %}
- <span class="disabled">{{ pagination.paginator.num_pages }}</span>
- {% endif %}
+ {% if pagination.has_next %}
+ <a href="{% url parties.screenshots.views.index pagination.paginator.num_pages %}">{{ pagination.paginator.num_pages }}</a>
+ {% else %}
+ <span class="disabled">{{ pagination.paginator.num_pages }}</span>
+ {% endif %}
</span>
{% if pagination.has_next %}
diff --git a/screenshots/templates/page.html b/screenshots/templates/page.html
index e4952b9..288be10 100644
--- a/screenshots/templates/page.html
+++ b/screenshots/templates/page.html
@@ -1,8 +1,8 @@
<html>
<head>
<title>Debian Games Screenshots Party!! - {% block title %}{% endblock %}</title>
- <script type="text/javascript" src="/javascript/jquery/jquery.js"></script>
- <script type="text/javascript" src="/screenshots/javascript/scripts.js"></script>
+ <script type="text/javascript" src="/javascript/jquery/jquery.js"></script>
+ <script type="text/javascript" src="/screenshots/javascript/scripts.js"></script>
</head>
<body>
<img src="http://pkg-games.alioth.debian.org/proposed-logo.png" width="87" height="107" align="left" alt="Debian Games Logo" />
diff --git a/screenshots/templatetags/extras.py b/screenshots/templatetags/extras.py
index bdcf212..9f099c5 100644
--- a/screenshots/templatetags/extras.py
+++ b/screenshots/templatetags/extras.py
@@ -21,7 +21,7 @@ def timesince_seconds(time = None):
value = hours
elif minutes > 0:
if minutes == 1: unit = "min"
- else: unit = "mins"
+ else: unit = "mins"
value = minutes
elif seconds > 0:
if seconds == 1: unit = "sec"
diff --git a/screenshots/views.py b/screenshots/views.py
index d4a1be2..b8530c2 100644
--- a/screenshots/views.py
+++ b/screenshots/views.py
@@ -205,4 +205,4 @@ def udd_import(request):
response = HttpResponseRedirect(reverse('parties.screenshots.views.index'))
- return response
\ No newline at end of file
+ return response
diff --git a/settings.py b/settings.py
index 6fc6f02..f6739bf 100644
--- a/settings.py
+++ b/settings.py
@@ -5,7 +5,7 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
- ('Paul Wise', 'pabs at debian.org'),
+ ('Paul Wise', 'pabs at debian.org'),
)
MANAGERS = ADMINS
@@ -53,15 +53,15 @@ SECRET_KEY = '(zy at 4^1htqd at frzjrnt1)^x9=d6m6d8%d4gr_kh1sud8(ok5sb'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-# 'django.template.loaders.eggs.load_template_source',
+ 'django.template.loaders.filesystem.load_template_source',
+ 'django.template.loaders.app_directories.load_template_source',
+# 'django.template.loaders.eggs.load_template_source',
)
MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
)
ROOT_URLCONF = 'parties.urls'
@@ -71,9 +71,9 @@ TEMPLATE_DIRS = (
)
INSTALLED_APPS = (
-# 'django.contrib.auth',
-# 'django.contrib.contenttypes',
-# 'django.contrib.sessions',
-# 'django.contrib.sites',
+# 'django.contrib.auth',
+# 'django.contrib.contenttypes',
+# 'django.contrib.sessions',
+# 'django.contrib.sites',
'parties.screenshots'
)
--
Code for the Debian Games Parties
More information about the Pkg-games-commits
mailing list