[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a
|
From: |
root |
|
Subject: |
[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a2bbdca277fc94ad282656348108683c4928d0d0 |
|
Date: |
Wed, 17 Jun 2009 22:34:53 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".
The branch, master has been updated
via a2bbdca277fc94ad282656348108683c4928d0d0 (commit)
via c427750418e60a792b7380a1c0d2cabd9a85b884 (commit)
via b846760e8e43b0493065e29b480b59f99265a38a (commit)
via 7b8b579012ad95f692df1f61d26208b8e9eeffb2 (commit)
via 104339f0ba354d36deb84130f7c7863fc69c6079 (commit)
from d866d281a497deb6e17e585125fe6d851be0f1d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=a2bbdca277fc94ad282656348108683c4928d0d0
commit a2bbdca277fc94ad282656348108683c4928d0d0
Author: Jonathan Gonzalez V <address@hidden(none)>
Date: Wed Jun 17 11:20:45 2009 -0400
Moved images/common/icon.png to images/
diff --git a/media/images/common/icon.png b/media/images/icon.png
similarity index 100%
rename from media/images/common/icon.png
rename to media/images/icon.png
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=c427750418e60a792b7380a1c0d2cabd9a85b884
commit c427750418e60a792b7380a1c0d2cabd9a85b884
Author: Jonathan Gonzalez V <address@hidden(none)>
Date: Wed Jun 17 11:20:06 2009 -0400
Removed images/Savannah.theme/
diff --git a/media/images/Savannah.theme/.gitignore
b/media/images/Savannah.theme/.gitignore
deleted file mode 100644
index 35bed13..0000000
--- a/media/images/Savannah.theme/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.xvpics
\ No newline at end of file
diff --git a/media/images/Savannah.theme/arrows
b/media/images/Savannah.theme/arrows
deleted file mode 120000
index de6072e..0000000
--- a/media/images/Savannah.theme/arrows
+++ /dev/null
@@ -1 +0,0 @@
-../common/arrows1
\ No newline at end of file
diff --git a/media/images/Savannah.theme/bool b/media/images/Savannah.theme/bool
deleted file mode 120000
index 9bba32e..0000000
--- a/media/images/Savannah.theme/bool
+++ /dev/null
@@ -1 +0,0 @@
-../common/bool1
\ No newline at end of file
diff --git a/media/images/Savannah.theme/contexts
b/media/images/Savannah.theme/contexts
deleted file mode 120000
index 622e933..0000000
--- a/media/images/Savannah.theme/contexts
+++ /dev/null
@@ -1 +0,0 @@
-../common/contexts1
\ No newline at end of file
diff --git a/media/images/Savannah.theme/floating.png
b/media/images/Savannah.theme/floating.png
deleted file mode 120000
index 7e29c25..0000000
--- a/media/images/Savannah.theme/floating.png
+++ /dev/null
@@ -1 +0,0 @@
-../common/floating.png
\ No newline at end of file
diff --git a/media/images/Savannah.theme/gnalogo.png
b/media/images/Savannah.theme/gnalogo.png
deleted file mode 120000
index 27a3d32..0000000
--- a/media/images/Savannah.theme/gnalogo.png
+++ /dev/null
@@ -1 +0,0 @@
-../common/gnalogo.png
\ No newline at end of file
diff --git a/media/images/Savannah.theme/icon.png
b/media/images/Savannah.theme/icon.png
deleted file mode 120000
index 1ebb27e..0000000
--- a/media/images/Savannah.theme/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-../common/icon.png
\ No newline at end of file
diff --git a/media/images/Savannah.theme/leopard.png
b/media/images/Savannah.theme/leopard.png
deleted file mode 100644
index 4250b10..0000000
Binary files a/media/images/Savannah.theme/leopard.png and /dev/null differ
diff --git a/media/images/Savannah.theme/misc b/media/images/Savannah.theme/misc
deleted file mode 120000
index 94fba6b..0000000
--- a/media/images/Savannah.theme/misc
+++ /dev/null
@@ -1 +0,0 @@
-../common/misc-default
\ No newline at end of file
diff --git a/media/images/Savannah.theme/point.png
b/media/images/Savannah.theme/point.png
deleted file mode 100644
index 5560e52..0000000
Binary files a/media/images/Savannah.theme/point.png and /dev/null differ
diff --git a/media/images/Savannah.theme/roles
b/media/images/Savannah.theme/roles
deleted file mode 120000
index 6275ec2..0000000
--- a/media/images/Savannah.theme/roles
+++ /dev/null
@@ -1 +0,0 @@
-../common/roles1
\ No newline at end of file
diff --git a/media/images/Savannah.theme/steel.png
b/media/images/Savannah.theme/steel.png
deleted file mode 100644
index 5d00769..0000000
Binary files a/media/images/Savannah.theme/steel.png and /dev/null differ
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=b846760e8e43b0493065e29b480b59f99265a38a
commit b846760e8e43b0493065e29b480b59f99265a38a
Author: Jonathan Gonzalez V <address@hidden(none)>
Date: Wed Jun 17 11:10:05 2009 -0400
Move the identity form to the conf section to avoid the idea of have one
page per form
diff --git a/savane/savane_user/views.py b/savane/savane_user/views.py
index b91332e..7aa6af5 100644
--- a/savane/savane_user/views.py
+++ b/savane/savane_user/views.py
@@ -34,11 +34,13 @@ def sv_conf( request ):
form_pass = PasswordForm ()
form_mail = MailForm ()
+ form_identity = IdentityForm ()
return render_to_response( 'savane_user/conf.html',
RequestContext( request,
{ 'form_pass' : form_pass,
'form_mail' : form_mail,
+ 'form_identity' :
form_identity,
}
) )
def sv_identity( request ):
@@ -85,18 +87,6 @@ def sv_authentication( request ):
) )
-
-class PasswordForm( forms.Form ):
- old_password = forms.CharField(widget=forms.PasswordInput,required=True)
- new_password = forms.CharField(widget=forms.PasswordInput,required=True)
- repated_password =
forms.CharField(widget=forms.PasswordInput,required=True)
- accion = forms.CharField( widget=forms.HiddenInput, required=True,
initial='update_password' )
-
- def clean( self ):
- cleaned_data = self.cleaned_data
- new_password = cleaned_data.get('new_password')
- old_password = cleaned_data.get('old_password')
-
def sv_mail( request ):
if request.method == 'POST':
@@ -128,3 +118,18 @@ def sv_mail( request ):
class MailForm( forms.Form ):
email = forms.CharField(required=True)
+
+class PasswordForm( forms.Form ):
+ old_password = forms.CharField(widget=forms.PasswordInput,required=True)
+ new_password = forms.CharField(widget=forms.PasswordInput,required=True)
+ repated_password =
forms.CharField(widget=forms.PasswordInput,required=True)
+ accion = forms.CharField( widget=forms.HiddenInput, required=True,
initial='update_password' )
+
+ def clean( self ):
+ cleaned_data = self.cleaned_data
+ new_password = cleaned_data.get('new_password')
+ old_password = cleaned_data.get('old_password')
+
+class IdentityForm( forms.Form ):
+ name = forms.CharField( required = True )
+ last_name = forms.CharField( required = False )
diff --git a/template/savane_user/conf.html b/template/savane_user/conf.html
index 9a7d335..827b47c 100644
--- a/template/savane_user/conf.html
+++ b/template/savane_user/conf.html
@@ -1,13 +1,6 @@
-{# -*- Mode: django-html; -*- #}
{% extends "base.html" %}
{% block content %}
-<ul class="section">
- <li><a href="identity">Identity</a></li>
- <li><a href="authentication">Authentication</a></li>
- <li><a href="mail">Mail</a></li>
-</ul>
-
<div class="box">
<div class="boxtitle">Change Password</div>
<div class="boxitem">
@@ -31,10 +24,45 @@
<div class="boxtitle">Change E-Mail</div>
<div class="boxitem">
<form method="post">
- {{form_mail.as_p}}
- <input type="submit" value="Update" />
+ <dl>
+ {% for field in form_mail %}
+ {% if field.is_hidden %}
+ {{field}}
+ {% else %}
+ <dt>{{ field.label_tag }} {{ field.error }}</dt>
+ <dd>{{ field }}</dd>
+ {% endif %}
+ {% endfor %}
+ <dd><input type="submit" value="Update" name="Update" /></dd>
+ </dl>
+ </form>
+ </div>
+</div>
+
+<div class="box">
+ <div class="boxtitle">Change Name</div>
+ <div class="boxitem">
+ <form method="post">
+ <dl>
+ {% for field in form_identity %}
+ {% if field.is_hidden %}
+ {{field}}
+ {% else %}
+ <dt>{{ field.label_tag }} {{ field.error }}</dt>
+ <dd>{{ field }}</dd>
+ {% endif %}
+ {% endfor %}
+ <dd><input type="submit" value="Update" name="Update" /></dd>
+ </dl>
</form>
</div>
</div>
{% endblock %}
+{% comment %}
+Local Variables: **
+mode: django-html **
+tab-width: 4 **
+indent-tabs-mode: nil **
+End: **
+{% endcomment %}
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=7b8b579012ad95f692df1f61d26208b8e9eeffb2
commit 7b8b579012ad95f692df1f61d26208b8e9eeffb2
Author: Jonathan Gonzalez V <address@hidden(none)>
Date: Wed Jun 17 11:09:20 2009 -0400
Added a margin-top of 10px to .content and .box
diff --git a/media/css/Savannah.css b/media/css/Savannah.css
index b131e4a..bfe35b1 100644
--- a/media/css/Savannah.css
+++ b/media/css/Savannah.css
@@ -96,6 +96,7 @@ a:hover {
min-width: 210px;
/* width: 210px; */
margin-left: 5px;
+ margin-top: 10px;
padding-top: 5px;
background-color: white;
}
@@ -166,6 +167,7 @@ a:hover {
.content {
margin-left: 10px;
+ margin-top: 10px;
float: left;
width: 80%;
}
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=104339f0ba354d36deb84130f7c7863fc69c6079
commit 104339f0ba354d36deb84130f7c7863fc69c6079
Author: Jonathan Gonzalez V <address@hidden(none)>
Date: Wed Jun 17 10:51:29 2009 -0400
Remove saven_user.urls.py doesn't have sense since we use urls.py per app
diff --git a/savane/savane_user/savane_user.urls.py
b/savane/savane_user/savane_user.urls.py
deleted file mode 100644
index f1f4381..0000000
--- a/savane/savane_user/savane_user.urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.conf.urls.defaults import *
-from savane_user import views
-
-
-urlpatterns = patterns ('',
- (r'
- )
-----------------------------------------------------------------------
Summary of changes:
media/css/Savannah.css | 2 +
media/images/Savannah.theme/.gitignore | 1 -
media/images/Savannah.theme/arrows | 1 -
media/images/Savannah.theme/bool | 1 -
media/images/Savannah.theme/contexts | 1 -
media/images/Savannah.theme/floating.png | 1 -
media/images/Savannah.theme/gnalogo.png | 1 -
media/images/Savannah.theme/icon.png | 1 -
media/images/Savannah.theme/leopard.png | Bin 5111 -> 0 bytes
media/images/Savannah.theme/misc | 1 -
media/images/Savannah.theme/point.png | Bin 253 -> 0 bytes
media/images/Savannah.theme/roles | 1 -
media/images/Savannah.theme/steel.png | Bin 5705 -> 0 bytes
media/images/{common => }/icon.png | Bin 3290 -> 3290 bytes
savane/savane_user/savane_user.urls.py | 7 ----
savane/savane_user/views.py | 29 +++++++++++--------
template/savane_user/conf.html | 46 ++++++++++++++++++++++++------
17 files changed, 56 insertions(+), 37 deletions(-)
delete mode 100644 media/images/Savannah.theme/.gitignore
delete mode 120000 media/images/Savannah.theme/arrows
delete mode 120000 media/images/Savannah.theme/bool
delete mode 120000 media/images/Savannah.theme/contexts
delete mode 120000 media/images/Savannah.theme/floating.png
delete mode 120000 media/images/Savannah.theme/gnalogo.png
delete mode 120000 media/images/Savannah.theme/icon.png
delete mode 100644 media/images/Savannah.theme/leopard.png
delete mode 120000 media/images/Savannah.theme/misc
delete mode 100644 media/images/Savannah.theme/point.png
delete mode 120000 media/images/Savannah.theme/roles
delete mode 100644 media/images/Savannah.theme/steel.png
rename media/images/{common => }/icon.png (100%)
delete mode 100644 savane/savane_user/savane_user.urls.py
hooks/post-receive
--
Savane-cleanup framework
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a2bbdca277fc94ad282656348108683c4928d0d0,
root <=