mango r226 - in branches/django: . mango www

[ovitters svn gnome org]

Author: ovitters
Date: Sun Jun 22 18:03:26 2008
New Revision: 226
URL: http://svn.gnome.org/viewvc/mango?rev=226&view=rev

Log:
	* mango/settings.py: Remove 'www' from hard coded URL.
	* mango/views.py (get_xmlresponse): Add 'www' to template location.
	* www/page.xsl: Add 'www' for the CSS. Update tab URLs to match Django
	install.


Modified:
   branches/django/   (props changed)
   branches/django/ChangeLog
   branches/django/mango/settings.py
   branches/django/mango/views.py
   branches/django/www/page.xsl

Modified: branches/django/mango/settings.py
==============================================================================
--- branches/django/mango/settings.py	(original)
+++ branches/django/mango/settings.py	Sun Jun 22 18:03:26 2008
@@ -142,5 +142,5 @@
         
         break
 
-MANGO_CFG['base_url'] = 'http://localhost/mango/django/www'
+MANGO_CFG['base_url'] = 'http://localhost/mango/django'
 

Modified: branches/django/mango/views.py
==============================================================================
--- branches/django/mango/views.py	(original)
+++ branches/django/mango/views.py	Sun Jun 22 18:03:26 2008
@@ -45,7 +45,7 @@
     if response is None:
         response = HttpResponse(mimetype='text/xml')
 
-    response.write(ET.tostring(ET.ProcessingInstruction('xml-stylesheet', 'href="%s/%s" type="text/xsl"' % (settings.MANGO_CFG['base_url'], template))))
+    response.write(ET.tostring(ET.ProcessingInstruction('xml-stylesheet', 'href="%s/www/%s" type="text/xsl"' % (settings.MANGO_CFG['base_url'], template))))
     doc.write(response, 'utf-8')
     return response
 

Modified: branches/django/www/page.xsl
==============================================================================
--- branches/django/www/page.xsl	(original)
+++ branches/django/www/page.xsl	Sun Jun 22 18:03:26 2008
@@ -14,7 +14,7 @@
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
      <title>GNOME Mango: <xsl:value-of select="@title"/></title>
 
-     <link rel="stylesheet" type="text/css" href="{/page/@baseurl}/skin/default.css"/>
+     <link rel="stylesheet" type="text/css" href="{/page/@baseurl}/www/skin/default.css"/>
      <link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png"/>
      <link rel="SHORTCUT ICON" type="image/png" href="http://www.gnome.org/img/logo/foot-16.png";></link>
 
@@ -60,15 +60,15 @@
 	    </li>
 	    <xsl:if test="boolean(group)">
 	      <xsl:if test="boolean(group[ cn='accounts']) or boolean(group[ cn='sysadmin'])">
-		<li><xsl:if test="$channel = 'users'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/list_users.php"><span>Users</span></a></li>
-		<li><xsl:if test="$channel = 'accounts'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/list_accounts.php"><span>Applications</span></a></li>
+		<li><xsl:if test="$channel = 'users'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/users/"><span>Users</span></a></li>
+		<li><xsl:if test="$channel = 'accounts'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/requests/"><span>Applications</span></a></li>
 	      </xsl:if>
 	      <xsl:if test="boolean(group[ cn='sysadmin'])">
-	        <li><xsl:if test="$channel = 'mirrors'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/list_ftpmirrors.php"><span>Mirrors</span></a></li>
-		<li><xsl:if test="$channel = 'modules'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/list_modules.php"><span>Modules</span></a></li>
+		<li><xsl:if test="$channel = 'mirrors'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/mirrors/"><span>Mirrors</span></a></li>
+		<li><xsl:if test="$channel = 'modules'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/modules/"><span>Modules</span></a></li>
              </xsl:if>
 	     <xsl:if test="boolean(group[ cn='membctte'])">
-	       <li><xsl:if test="$channel = 'foundation'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/list_foundationmembers.php"><span>Foundation Members</span></a></li>
+	       <li><xsl:if test="$channel = 'foundation'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/foundationmembers/"><span>Foundation Members</span></a></li>
 	     </xsl:if>
 	     <li><xsl:if test="$channel = 'login'"><xsl:attribute name="class">selected</xsl:attribute></xsl:if><a href="{/page/@baseurl}/login.php?logout=true"><span>Logout</span></a></li>
 	   </xsl:if>