Quoth the server...

# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1277712001 18000 # Node ID 2e7226e90157eb9f3923e6736b1b46d78a79a56d # Parent d9658d30b8144a5e060bc40ead5ce3e8746997a4 Many fixes. See detailed description. - Style errors - Writer proper 404 and 500 templates - Make login page redirect back to page being viewed (still buggy?) - Provide a brief blurb about Agora - Use tables for registration and login forms (need to be styled) - Fix typos, grammatical errors. - Don't use .djhtml extension for some templates diff -r d9658d30b814 -r 2e7226e90157 static/djangodocs.css --- a/static/djangodocs.css Sun Jun 27 21:56:57 2010 -0500 +++ b/static/djangodocs.css Mon Jun 28 03:00:01 2010 -0500 @@ -33,6 +33,13 @@ overflow: hidden; } +.error, .errorlist{ + color: #ef2929; + display: block; +} + + + .whitebox{ font: 14px/140% "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif; font-weight: lighter; @@ -112,11 +119,6 @@ #header div.nav { margin-top: -27px; } #footer div.nav { margin-bottom: -18px; } -/*** content ***/ -/* -#yui-main div.yui-b { position: relative; } -#yui-main div.yui-b { margin: 0 0 0 20px; background: white; color: black; padding: 0.3em 2em 1em 2em; } -*/ /*** basic styles ***/ @@ -137,7 +139,6 @@ div.figure p.caption { font-size:1em; margin-top:0; margin-bottom:1.5em; color: #555;} hr { color:#ccc; background-color:#ccc; height:1px; border:0; } p, ul, dl { margin-top:.6em; margin-bottom:1em; padding-bottom: 0.1em; text-align: left;} -#yui-main div.yui-b img { max-width: 50em; margin-left: auto; margin-right: auto; display: block; } caption { font-size:1em; font-weight:bold; margin-top:0.5em; margin-bottom:0.5em; margin-left: 2px; text-align: center; } blockquote { padding: 0 1em; margin: 1em 0; font:125%/1.2em "Trebuchet MS", sans-serif; border-left:2px solid; } strong { font-weight: bold; } diff -r d9658d30b814 -r 2e7226e90157 templates/404.html --- a/templates/404.html Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/404.html Mon Jun 28 03:00:01 2010 -0500 @@ -1,10 +1,12 @@ - - -Quoth the server... - - +{% extends "controls.djhtml" %} +{% block title %} +Object not found +{% endblock %} +{% block content %} +

-404! + The resource you were looking for is unavailable. If you think this + is our fault, please let us know.

- - +

+{% endblock %} diff -r d9658d30b814 -r 2e7226e90157 templates/500.html --- a/templates/500.html Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/500.html Mon Jun 28 03:00:01 2010 -0500 @@ -1,14 +1,12 @@ - - - Oh, snap! - - -

- Uh... looks like we messed up somehow. If this problem persists, - please let us know at agora@octave.org -

-

- Thanks! -

- - +{% extends "controls.djhtml" %} +{% block title %} +Server error +{% endblock %} +{% block content %} +

+

+ The server encountered an internal error. If the problem persists, + please let us know. +

+

+{% endblock %} diff -r d9658d30b814 -r 2e7226e90157 templates/controls.djhtml --- a/templates/controls.djhtml Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/controls.djhtml Mon Jun 28 03:00:01 2010 -0500 @@ -16,7 +16,7 @@

{% else %}

- Log in + Log in

{% endif %}

diff -r d9658d30b814 -r 2e7226e90157 templates/index.djhtml --- a/templates/index.djhtml Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/index.djhtml Mon Jun 28 03:00:01 2010 -0500 @@ -7,7 +7,10 @@

- Main screen turn on! + Agora Octave is a place dedicated for rapid collaboration related + to GNU Octave. You + can browse our code submissions + our contribute your own.

diff -r d9658d30b814 -r 2e7226e90157 templates/registration/activate.html --- a/templates/registration/activate.html Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/registration/activate.html Mon Jun 28 03:00:01 2010 -0500 @@ -9,13 +9,13 @@ {% if account %}

Account successfully activated. - Click here to log in. + Click here to log in.

{% else %}

- Account activation failed" %} + Account activation failed.

{% endif %} diff -r d9658d30b814 -r 2e7226e90157 templates/registration/login.html --- a/templates/registration/login.html Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/registration/login.html Mon Jun 28 03:00:01 2010 -0500 @@ -2,6 +2,7 @@ {% block content %}

+

Login

@@ -17,21 +18,11 @@ {% else %} - {% if form.errors %} -

{{form.errors}}

- {% endif %} {% csrf_token %} -

- Username: -
- -

-

- Password: -
- -

+ + {{form.as_table}} +

@@ -40,7 +31,7 @@ Forgot password? Reset it!

- Not member? Register! + No login name? Register!

{% endif %} diff -r d9658d30b814 -r 2e7226e90157 templates/registration/registration_form.html --- a/templates/registration/registration_form.html Sun Jun 27 21:56:57 2010 -0500 +++ b/templates/registration/registration_form.html Mon Jun 28 03:00:01 2010 -0500 @@ -8,35 +8,19 @@

- Please provide us some basic information to set up your account. + Please give us some basic information to set up your account. + Valid usernames consist of letters, numbers, and underscores.

+ {% if form.errors %} +

+ Please correct the errors below. +

+ {% endif %}

diff -r d9658d30b814 -r 2e7226e90157 urls.py --- a/urls.py Sun Jun 27 21:56:57 2010 -0500 +++ b/urls.py Mon Jun 28 03:00:01 2010 -0500 @@ -16,8 +16,7 @@ (r'^accounts/logout/', 'django.contrib.auth.views.logout', {'template_name' : 'index.djhtml', 'next_page' : '/'}), - (r'^accounts/', include('registration.urls'), - {'template_name' : 'registration/registration_form.djhtml'} ), + (r'^accounts/', include('registration.urls')), (r'^', include('agora.apps.bundle.urls')),