[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: |
Sylvain Beucler |
|
Subject: |
[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a62d4f9ecb8fda0eff9b5c65f2d5fd9af52ee075 |
|
Date: |
Thu, 15 Jul 2010 20:24:19 +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 a62d4f9ecb8fda0eff9b5c65f2d5fd9af52ee075 (commit)
from c7f3708765d89466db4829b68d24923b49a8a056 (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=a62d4f9ecb8fda0eff9b5c65f2d5fd9af52ee075
commit a62d4f9ecb8fda0eff9b5c65f2d5fd9af52ee075
Author: Sylvain Beucler <address@hidden>
Date: Thu Jul 15 22:22:52 2010 +0200
Infra for page titles
diff --git a/savane/my/urls.py b/savane/my/urls.py
index 5f405a7..110e222 100644
--- a/savane/my/urls.py
+++ b/savane/my/urls.py
@@ -46,12 +46,14 @@ def decorated_patterns(prefix, func, *args):
urlpatterns = decorated_patterns ('', login_required,
url(r'^$', direct_to_template,
- { 'template' : 'my/index.html' },
+ { 'template' : 'my/index.html',
+ 'extra_context' : { 'title' : 'My account', }, },
name='savane.my.views.index'),
url('^conf/$', views.sv_conf),
url('^conf/resume_skill$', views.sv_resume_skill),
url('^conf/ssh_gpg$', views.sv_ssh_gpg),
url(r'^groups/$', only_mine(object_list),
- { 'queryset' : svmain_models.ExtendedGroup.objects.all() },
+ { 'queryset' : svmain_models.ExtendedGroup.objects.all(),
+ 'extra_context' : { 'title' : "My groups", }, },
name='savane.my.group_list'),
)
diff --git a/savane/svmain/fixtures/demo/users_groups.yaml
b/savane/svmain/fixtures/demo/users_groups.yaml
index 7a1e950..eb82729 100644
--- a/savane/svmain/fixtures/demo/users_groups.yaml
+++ b/savane/svmain/fixtures/demo/users_groups.yaml
@@ -11,6 +11,7 @@
fields:
type: 1
devel_status: 6
+ license: 22
register_time: 2001-02-08 15:03:48
- model: auth.user
pk: 1
diff --git a/templates/base.html b/templates/base.html
index 48965e5..a5cac2e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,21 +2,21 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US.UTF-8"
xml:lang="en-US.UTF-8">
<head>
- <title>Welcome [Savannah]</title>
+ {% load i18n %}
+ <title>
+ {% block title %}{% if title %}{{ title }}{% else %}{% trans 'Welcome'
%}{% endif %}
+ [Savannah]{% endblock %}
+ </title>
<meta name="Generator" content="Savane 3.1-cleanup, see
http://savannah.nongnu.org/projects/savane-cleanup"; />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<link rel="stylesheet" type="text/css"
href="{{STATIC_MEDIA_URL}}savane/css/Savannah.css" />
<link rel="icon" type="image/png"
href="{{STATIC_MEDIA_URL}}savane/images/icon.png" />
- <meta name="Author" content="Copyright (C) 2000, 2001, 2002, 2003 Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA
Verbatim copying and distribution of this entire article is permitted in any
medium, provided this notice is preserved" />
- <meta name="Keywords" content="Savannah,GNU, FSF, Free Software
Foundation, GNU/Linux, Linux, Emacs, GCC, Unix, Free Software, Operating
System, GNU Kernel, HURD, gnus, SourceForge" />
- <meta name="Description" content="Savannah is a central point for
development, distribution and maintainance of Free Software. It allows
contributors to easily join existing Free Software projects." />
-
</head>
<body>
<div class="main_menu">
- <a href="/"><img src="{{STATIC_MEDIA_URL}}savane/images/floating.png"
alt="Back to Savannah Homepage" border="0" width="118" height="100" /></a>
- <a href="">Hosted Projects</a>
- <a href="">Help</a>
+ <a href="/"><img src="{{STATIC_MEDIA_URL}}savane/images/floating.png"
alt="Back to homepage" border="0" width="118" height="100" /></a>
+ <a href="TODO">Hosted Projects</a>
+ <a href="TODO">Help</a>
<div class="menu_search">
<form action="/search/#options" method="get" >
@@ -99,6 +99,7 @@
{{ success_msg }}
</div>
{% endif %}
+ <h1>{{ title }}</h1>
{% block content %}
{% endblock %}
</div>
diff --git a/templates/my/index.html b/templates/my/index.html
index 1750efe..4b11ab8 100644
--- a/templates/my/index.html
+++ b/templates/my/index.html
@@ -1,9 +1,6 @@
-{# -*- Mode: django-html; -*- #}
{% extends "base.html" %}
{% block content %}
-<p>My nice personal page.</p>
-
<p>
<a href="{% url savane.my.views.sv_conf %}">Account configuration</a>
| <a href="{% url savane.my.group_list %}">My groups</a>
@@ -11,3 +8,10 @@
</p>
{% endblock %}
+{% comment %}
+Local Variables: **
+mode: django-html **
+tab-width: 4 **
+indent-tabs-mode: nil **
+End: **
+{% endcomment %}
-----------------------------------------------------------------------
Summary of changes:
savane/my/urls.py | 6 ++++--
savane/svmain/fixtures/demo/users_groups.yaml | 1 +
templates/base.html | 17 +++++++++--------
templates/my/index.html | 10 +++++++---
4 files changed, 21 insertions(+), 13 deletions(-)
hooks/post-receive
--
Savane-cleanup framework
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. a62d4f9ecb8fda0eff9b5c65f2d5fd9af52ee075,
Sylvain Beucler <=