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

[Jonathan Gonzalez V.]

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  b00545631859ee4c85a1ee5a0a16971101d9ce7e (commit)
       via  b7ace01fc8a5ba1a3a6b30c925e4891970ec06f5 (commit)
       via  fcb601fbef65640ffa726ca0f696819043754964 (commit)
      from  a13597288751c650e7bafa4a3a7c95dd5e914b4c (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=b00545631859ee4c85a1ee5a0a16971101d9ce7e

commit b00545631859ee4c85a1ee5a0a16971101d9ce7e
Author: Jonathan Gonzalez V <address@hidden>
Date:   Thu Jun 25 10:49:32 2009 -0400

    Added the contact view into main app and move all the urls related to main 
app to main/urls.py

diff --git a/savane/main/urls.py b/savane/main/urls.py
new file mode 100644
index 0000000..4fc2dc4
--- /dev/null
+++ b/savane/main/urls.py
@@ -0,0 +1,12 @@
+from django.conf.urls.defaults import *
+from main import views
+
+
+urlpatterns = patterns ('',
+                        url('^$',
+                            views.index,
+                            ),
+                        url('^contact$',
+                            views.contact,
+                            ),
+                        )
diff --git a/savane/main/views.py b/savane/main/views.py
index ee174d4..a511878 100644
--- a/savane/main/views.py
+++ b/savane/main/views.py
@@ -3,5 +3,11 @@ from django.shortcuts import render_to_response
 from django.http import HttpResponse
 
 def index(request):
-    return render_to_response( 'index.html', RequestContext( request, 
{'has_left_menu': False},
-                                                               ) )
+    return render_to_response( 'index.html',
+                               RequestContext( request, {'has_left_menu': 
False},
+                                               ) )
+
+def contact( request ):
+    return render_to_response( 'contact.html',
+                               RequestContext( request,
+                                               ))
diff --git a/savane/urls.py b/savane/urls.py
index 255cfa4..259b1d2 100644
--- a/savane/urls.py
+++ b/savane/urls.py
@@ -6,8 +6,8 @@ from django.conf import settings
 # admin.autodiscover()
 
 urlpatterns = patterns('',
-                       (r'^$', "main.views.index"),
-
+#                       (r'^$', "main.views.index"),
+                       (r'', include('main.urls')),
                        (r'^user/', include('savane_user.urls')),
 
                        # Uncomment the next line to enable the admin:
diff --git a/template/contact.html b/template/contact.html
new file mode 100644
index 0000000..e6e45b7
--- /dev/null
+++ b/template/contact.html
@@ -0,0 +1,44 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h2>E-mail contact</h2>
+
+<p>Note: If you need to get in touch with the developers of a
+particular project hosted here, please <em>check the project's page</em>
+(e.g. <code>/projects/myprojecname</code>) to find out the appropriate
+way to contact them.</p>
+
+<p>For general help with using the service, you can subscribe to the
+<strong>users mailing lists</strong> at <a
+href="http://lists.gnu.org/mailman/listinfo/savannah-users";>http://lists.gnu.org/mailman/listinfo/savannah-users</a>
+and send mail to <a
+href="mailto:address@hidden";>address@hidden</a> <span style="font-size: 
smaller">(mails
+from non-members are accepted but moderated on a daily basis)</span>.</p>
+
+<p>If you are the developer of one of the projects hosted here and you
+want to get in touch with the maintainers of this server (Savannah)
+you can then contact the <strong>Savannah Hackers</strong> by submitting a
+
+
+<a href="/support/?func=addsupport&amp;group=administration">[support 
request]</a>
+or sending mail to <a
+href="mailto:address@hidden";>address@hidden</a>
+(after checking the archives at <a
+href="http://lists.gnu.org/archive/html/savannah-hackers/";>http://lists.gnu.org/archive/html/savannah-hackers/</a>)
+- when you want to contact us about security or confidential issues,
+you may also use the address@hidden list.</p>
+
+<p>If you have found a bug in the Savane software (the software used
+to run this server), or you would like to request a new feature, you
+should use the Bugs system in <a
+href="http://gna.org/projects/savane";>Project Savane</a>.</p>
+
+{% 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=b7ace01fc8a5ba1a3a6b30c925e4891970ec06f5

commit b7ace01fc8a5ba1a3a6b30c925e4891970ec06f5
Author: Jonathan Gonzalez V <address@hidden>
Date:   Thu Jun 25 10:48:33 2009 -0400

    Added links to the left menu

diff --git a/template/base.html b/template/base.html
index 013d968..59b758e 100644
--- a/template/base.html
+++ b/template/base.html
@@ -12,8 +12,6 @@
     <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>
-
-  {{request.GET.test}}
   <body>
     <div class="main_menu">
       <a href="/"><img src="{{MEDIA_URL}}/images/floating.png" alt="Back to 
Savannah Homepage" border="0" width="118" height="100" /></a>
@@ -62,6 +60,30 @@
       <div class="body">
         {% ifequal has_left_menu None %}
         <div class="menu_left">
+          <strong>Site Help</strong>
+          <ul>
+            <li><a>User Docs: Cookbook</a></li>
+            <li><a>User Docs: In Depth Guide</a></li>
+            <li><a>Get Support</a></li>
+            <li><a href="{% url main.views.contact %}">Contact Us</a></li>
+            <li><a href="http://savannah.gnu.org/maintenance/CvsAnonymous";>CVS 
Instructions</a></li>
+            <li><a href="http://savannah.gnu.org/maintenance/FaQ";>FAQ</a></li>
+          </ul>
+          <strong>GNU Project</strong>
+          <ul>
+            <li><a href="http://www.gnu.org/help/help.html"; 
target="_blank">Help GNU</a></li>
+            <li><a href="http://www.gnu.org/directory/GNU"; target="_blank">All 
GNU Packages</a></li>
+            <li><a href="http://www.gnu.org/software/devel.html"; 
target="_blank">Dev Resources</a></li>
+            <li><a href="http://www.gnu.org/licenses/license-list.html"; 
target="_blank">License List</a></li>
+            <li><a href="http://www.gnu.org/prep/ftp.htm"; target="_blank">GNU 
Mirrors</a></li>
+          </ul>
+          <strong>Free Software Foundation</strong>
+          <ul>
+            <li><a href="http://www.fsf.org/events/"; target="_blank">Coming 
Events</a></li>
+            <li><a href="http://gplv3.fsf.org/"; target="_blank">GNU GPL 
v3</a></li>
+            <li><a href="http://www.fsf.org/directory/"; target="_blank">Free 
Software Directory</a></li>
+            <li><a 
href="http://savannah.gnu.org/maintenance/SavannahCryptographicRestrictions"; 
target="_blank">Cryptographic software legal notice</a></li>
+          </ul>
         </div>
         {% endifequal %}
         <div class="content">

http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=fcb601fbef65640ffa726ca0f696819043754964

commit fcb601fbef65640ffa726ca0f696819043754964
Author: Jonathan Gonzalez V <address@hidden>
Date:   Thu Jun 25 10:48:07 2009 -0400

    Defined style for the left menu

diff --git a/media/css/Savannah.css b/media/css/Savannah.css
index bfe35b1..bfb022b 100644
--- a/media/css/Savannah.css
+++ b/media/css/Savannah.css
@@ -73,6 +73,7 @@ a:hover {
    border-style: solid;
    border-width: 0 1px 1px 0;
    margin: 0px;
+   margin-top: 10px;
 }
 
 
@@ -153,12 +154,22 @@ a:hover {
 
 .menu_left {
    margin-top: 0px;
-   width: 18%;
+   width: 15%;
    height: 300px;
    background-color: #ffe4b7;
    float: left;
    margin: 4px;
    border: thin dotted #E0C080;
+   padding: 10px;
+}
+
+.menu_left ul {
+   margin: 0px;
+   margin-bottom: 10px;
+}
+.menu_left li {
+   list-style-type: none;
+   margin-left: -30px;
 }
 
 /* End Menu */

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

Summary of changes:
 media/css/Savannah.css |   13 ++++++++++++-
 savane/main/urls.py    |   12 ++++++++++++
 savane/main/views.py   |   10 ++++++++--
 savane/urls.py         |    4 ++--
 template/base.html     |   26 ++++++++++++++++++++++++--
 template/contact.html  |   44 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 savane/main/urls.py
 create mode 100644 template/contact.html


hooks/post-receive
-- 
Savane-cleanup framework