[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 097e9eae3d6f9153964ca28fb17e5d2a36d211d0

[Sylvain Beucler]

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  097e9eae3d6f9153964ca28fb17e5d2a36d211d0 (commit)
      from  808ab74cb6e9ffe3907f6a71a31a13aecada0010 (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=097e9eae3d6f9153964ca28fb17e5d2a36d211d0

commit 097e9eae3d6f9153964ca28fb17e5d2a36d211d0
Author: Sylvain Beucler <address@hidden>
Date:   Sun Jul 25 18:07:05 2010 +0200

    Improve project page (mimic Savane 3)

diff --git a/savane/svmain/fixtures/demo/users_groups.yaml 
b/savane/svmain/fixtures/demo/users_groups.yaml
index 78b3744..5426834 100644
--- a/savane/svmain/fixtures/demo/users_groups.yaml
+++ b/savane/svmain/fixtures/demo/users_groups.yaml
@@ -1,7 +1,8 @@
 - model: svmain.groupconfiguration
   pk: 1
   fields:
-    name: "GNU projects"
+    name: "Official GNU software"
+    description: "This project is part of the GNU Project."
 - model: auth.group
   pk: 1
   fields:
@@ -9,6 +10,8 @@
 - model: svmain.svgroupinfo
   pk: 1
   fields:
+    full_name: emacs
+    long_description: "Emacs is the extensible, customizable, self-documenting 
real-time display editor."
     type: 1
     devel_status: 6
     license: 22
@@ -24,6 +27,8 @@
   pk: 2
   fields:
     username: rms
+    first_name: Richard M.
+    last_name: Stallman
     password: sha1$6bde8$748d99ad2f2493225efb0e6b78914c5c9a065275
     groups: [1, ]
 - model: svmain.svuserinfo
diff --git a/savane/svmain/models.py b/savane/svmain/models.py
index b79ae43..1d7bc51 100644
--- a/savane/svmain/models.py
+++ b/savane/svmain/models.py
@@ -140,6 +140,13 @@ class SvUserInfo(models.Model):
                           + " WHERE status = 'A'"
                           )
 
+    def get_full_name_display(self):
+        if self.user.get_full_name() != "":
+            return self.user.get_full_name()
+        else:
+            return self.user.username
+
+
 
 class License(models.Model):
     """
@@ -480,12 +487,15 @@ class SvGroupInfo(models.Model):
     #patch_private_exclude_address text
     #cookbook_private_exclude_address text
 
-    def full_name_display(self):
+    def get_full_name_display(self):
         if self.full_name != "":
             return self.full_name
         else:
             return self.group.name
 
+    def get_admins(self):
+        return auth_models.User.objects.filter(membership__admin_flags='A')
+
     @staticmethod
     def query_active_groups_raw(conn, fields):
         """
diff --git a/static_media/savane/css/Savannah.css 
b/static_media/savane/css/Savannah.css
index 2cddfe6..bcdade7 100644
--- a/static_media/savane/css/Savannah.css
+++ b/static_media/savane/css/Savannah.css
@@ -554,6 +554,7 @@ li.topmenuitemsubmenuseparator {
        width: 96%;
        margin-left: 2%;
        margin-right: 2%;
+       margin-bottom: 15px;
        vertical-align: top;
        border-spacing: 1px;
        border: 0;
@@ -1077,7 +1078,7 @@ li.topmenuitemsubmenu:hover {
 }
 
 .boxtitle  {   
-       background-image: url("../images/Savannah.theme/leopard.png");
+       background-image: url("../images/leopard.png");
        background-color: #eddb5a;
        border: thin outset #641212;
        color: #000000;
diff --git a/static_media/savane/images/leopard.png 
b/static_media/savane/images/leopard.png
new file mode 100644
index 0000000..4250b10
Binary files /dev/null and b/static_media/savane/images/leopard.png differ
diff --git a/templates/svmain/group_admin.html 
b/templates/svmain/group_admin.html
index 7a42a6a..6b4d61a 100644
--- a/templates/svmain/group_admin.html
+++ b/templates/svmain/group_admin.html
@@ -3,7 +3,7 @@
 {% load svtopmenu %}
 
 {% block title %}
-{{group.svgroupinfo.full_name_display}} - {{title}}
+{{group.svgroupinfo.get_full_name_display}} - {{title}}
 {% endblock %}
 
 {% block icon %}preferences{% endblock %}
diff --git a/templates/svmain/group_admin_members.html 
b/templates/svmain/group_admin_members.html
index 17f592c..b9d16a7 100644
--- a/templates/svmain/group_admin_members.html
+++ b/templates/svmain/group_admin_members.html
@@ -3,7 +3,7 @@
 {% load svtopmenu %}
 
 {% block title %}
-{{group.svgroupinfo.full_name_display}} - {{title}}
+{{group.svgroupinfo.get_full_name_display}} - {{title}}
 {% endblock %}
 
 {% block icon %}preferences{% endblock %}
diff --git a/templates/svmain/group_admin_members_add.html 
b/templates/svmain/group_admin_members_add.html
index 8f68bac..f1370b1 100644
--- a/templates/svmain/group_admin_members_add.html
+++ b/templates/svmain/group_admin_members_add.html
@@ -3,7 +3,7 @@
 {% load svtopmenu %}
 
 {% block title %}
-{{group.svgroupinfo.full_name_display}} - {{title}}
+{{group.svgroupinfo.get_full_name_display}} - {{title}}
 {% endblock %}
 
 {% block icon %}preferences{% endblock %}
diff --git a/templates/svmain/group_detail.html 
b/templates/svmain/group_detail.html
index ae90bee..4c97d9c 100644
--- a/templates/svmain/group_detail.html
+++ b/templates/svmain/group_detail.html
@@ -8,24 +8,40 @@
 
 {% block content %}
 
+<div class="indexright">
+  <div class="box">
+    <div class="boxtitle">{% trans "Membership Info" %}</div>
+    {% if group.svgroupinfo.get_admins %}
+    <div class="boxitem"><span class="smaller">{% trans "Project Admins:" 
%}</span></div>
+    {% for user in group.svgroupinfo.get_admins %}
+    <div class="{% cycle 'boxitemalt' 'boxitem' %}"><span 
class="smaller">&nbsp;
+       - <a href="{% url savane.svmain.user_detail user.username %}">{{ 
user.svuserinfo.get_full_name_display }}</a></span></div>
+    {% endfor %}
+    {% else %}
+    <div class="boxitem"><span class="smaller">{% trans "No members!" 
%}</span></div>
+    {% endif %}
+    <div class="boxitem"><span class="smaller">{% blocktrans count 
group.user_set.count as count %}{{count}} active member{% plural %}{{count}} 
active members{% endblocktrans %}</span></div>
+    <div class="boxitemalt"><span class="smaller">[<a href="memberlist/">{% 
trans "View Members" %}</a>]</span></div>
+  </div>
+  <div class="box">
+    <div class="boxtitle">{% trans "Group identification" %}</div>
+    <div class="boxitem"><span class="smaller">{% trans "Id:" %} 
<strong>#{{group.pk}}</strong></span></div>
+    <div class="boxitemalt"><span class="smaller">{% trans "System Name:" %} 
<strong>{{group.name}}</strong></span></div>
+    <div class="boxitem"><span class="smaller">{% trans "Name:" %} 
<strong>{{group.svgroupinfo.full_name}}</strong></span></div>
+    <div class="boxitemalt"><span class="smaller">{% trans "Group Type:" %} 
<strong>{{group.svgroupinfo.type.name}}</strong></span></div>
+  </div>
+</div>
+
+<div class="indexcenter">
+<p>{{group.svgroupinfo.type.description}}</p>
+<p></p>
+<p>{{group.svgroupinfo.long_description}}</p>
 <p>
-Name: {{group.name}}<br />
-License: <a 
href="{{group.svgroupinfo.license.get_absolute_url}}">{{group.svgroupinfo.license.name}}</a><br
 />
-Development status: {{group.svgroupinfo.devel_status}}<br />
+{% trans "Registration Date" %}: {{group.svgroupinfo.register_time}}<br />
+{% trans "License" %}: <a 
href="{{group.svgroupinfo.license.get_absolute_url}}">{{group.svgroupinfo.license.name}}</a><br
 />
+{% trans "Development Status" %}: {{group.svgroupinfo.devel_status}}<br />
 </p>
 
-<p>Members:</p>
-
-{% if group.user_set.all %}
-<ul>
-  {% for user in group.user_set.all %}
-  <li><a href="{% url savane.svmain.user_detail user.username %}">{{ 
user.username }}</a></li>
-  {% endfor %}
-  </ul>
-{% else %}
-  No members!
-{% endif %}
-
 {% if user.is_authenticated %}
 <form action="join/" method="POST">{% csrf_token %}
 <input type="submit" value="{% trans 'Join this project' %}" />

-----------------------------------------------------------------------

Summary of changes:
 savane/svmain/fixtures/demo/users_groups.yaml |    7 +++-
 savane/svmain/models.py                       |   12 ++++++-
 static_media/savane/css/Savannah.css          |    3 +-
 static_media/savane/images/leopard.png        |  Bin 0 -> 5111 bytes
 templates/svmain/group_admin.html             |    2 +-
 templates/svmain/group_admin_members.html     |    2 +-
 templates/svmain/group_admin_members_add.html |    2 +-
 templates/svmain/group_detail.html            |   46 +++++++++++++++++--------
 8 files changed, 53 insertions(+), 21 deletions(-)
 create mode 100644 static_media/savane/images/leopard.png


hooks/post-receive
-- 
Savane-cleanup framework