[pirate-politics] r622 committed - modified helloword.html so it is up to date for new installs

[pirate-...@googlecode.com]

Revision: 622
Author: fragro
Date: Thu Feb 10 15:02:05 2011
Log: modified helloword.html so it is up to date for new installs
http://code.google.com/p/pirate-politics/source/detail?r=622

Modified:
/trunk/pirate-politics/new_templates/base.html
/trunk/pirate-politics/new_templates/helloworld.html
/trunk/pirate-politics/pirate_deliberation/templatetags/argumenttags.py

=======================================
--- /trunk/pirate-politics/new_templates/base.html Wed Feb 9 00:35:14 2011
+++ /trunk/pirate-politics/new_templates/base.html Thu Feb 10 15:02:05 2011
@@ -146,7 +146,7 @@
{% if request.user.is_authenticated %}
<li><a href="{% pp_url template='user_profile.html'
object=request.user%}">profile</a></li>
{% else %}
- <li><a href="/register.html">profile</a></li>
+ <li><a href="{% pp_url template='register.html'
return_path=request.META.PATH_INFO
return_query=request.META.QUERY_STRING %}">profile</a></li>
{% endif %}
<li><a href="/platform.html">platform</a></li>
<li><a href="/welcome.html">about</a></li>
=======================================
--- /trunk/pirate-politics/new_templates/helloworld.html Mon Jan 17
12:38:36 2011
+++ /trunk/pirate-politics/new_templates/helloworld.html Thu Feb 10
15:02:05 2011
@@ -1,8 +1,33 @@
{% extends 'base.html' %}
-{% block title %}Hello World{% endblock %}
+{% load pp_url %}
+{% load usertags %}
+
+{% block title %}Register Page{% endblock %}
+{% block css %}
+{% endblock %}
+
+{% block browser_bar %}
+
+{% endblock %}
+
{% block content %}
- {% hello_tag user=request.user session=request.session
POST=request.POST path=request.path %}
- {% include "session.html" %}
- {% include "session_form.html" %}
- {% endhello_tag %}
+ <div class="stage">
+
+ <div class="issuemask">
+
+ <div class="pagehead">Hello, Welcome to pirate-politics.</div>
+
+ <div class="issuebound">
+
+ <p>To get started, <a href="/setup_admin/">set up
an admin account</a> and create a new topic on the Staff Control Panel in
the user profile.</p>
+ </div>
+ <div class="rightcol">
+ {% include '_rightcol.html' %}
+ </div>
+ </div>
+ </div>
+
+
+
{% endblock content %}
+
=======================================
--- /trunk/pirate-politics/pirate_deliberation/templatetags/argumenttags.py
Thu Feb 10 14:21:57 2011
+++ /trunk/pirate-politics/pirate_deliberation/templatetags/argumenttags.py
Thu Feb 10 15:02:05 2011
@@ -66,13 +66,13 @@
if isinstance(arg_type, unicode):
arg_type, created = Stance.objects.get_or_create(arg=arg_type)

- if isinstance(start, int) and isinstance(end, int):
- try:
+ if isinstance(start, int) and isinstance(end, int):
+ try:
rng = (int(start), int(end))
- except:
+ except:
rng = None

- if not rng or len(rng) != 2:
+ if not rng or len(rng) != 2:
raise ValueError("The argument 'start=' and 'end=' to the
pp_get_argument_list tag must be "
"provided either in the form of an int")
else: