Make the Django Generated paths work when changing the url root. Fixes …

…tildaslash#226

account/tests.py

@@ -116,7 +116,7 @@ def waitforload(self):
             lambda driver: driver.find_element_by_tag_name('body'))
 
     def test_login(self):
-        self.selenium.get('%s%s' % (self.live_server_url, '/'))
+        self.selenium.get('%s%s' % (self.live_server_url, reverse('home')))
         self.waitforload()
         username_input = self.selenium.find_element_by_name("username")
         username_input.send_keys(self.unorm.username)
@@ -127,7 +127,7 @@ def test_login(self):
         self.waitforload()
 
     def test_login_wrongpass(self):
-        self.selenium.get('%s%s' % (self.live_server_url, '/'))
+        self.selenium.get('%s%s' % (self.live_server_url, reverse('home')))
         self.waitforload()
         username_input = self.selenium.find_element_by_name("username")
         username_input.send_keys(self.unorm.username)
@@ -142,7 +142,7 @@ def test_login_wrongpass(self):
     def test_login_disabled(self):
         self.unorm.is_active = False
         self.unorm.save()
-        self.selenium.get('%s%s' % (self.live_server_url, '/'))
+        self.selenium.get('%s%s' % (self.live_server_url, reverse('home')))
         self.waitforload()
         username_input = self.selenium.find_element_by_name("username")
         username_input.send_keys(self.unorm.username)

cred/icon.py

@@ -36,13 +36,11 @@ def build_layout(images):
 
 
 def build_css_class(data):
-    bgurl = settings.STATIC_URL + settings.CRED_ICON_SPRITE
-
     css = '/* ' + data['filename'] + '*/\n'
     css += '.' + data['css-class'] + ' {\n'
     css += '    height: %spx;\n' % data['height']
     css += '    width: %spx;\n' % data['width']
-    css += '    background: url(%s) -%spx -%spx;\n' % (bgurl, data['xoffset'], data['yoffset'])
+    css += '    background-position: -%spx -%spx;\n' % (data['xoffset'], data['yoffset'])
     css += '}\n\n'
 
     return css

cred/tests.py

@@ -461,7 +461,7 @@ def waitforload(self):
             lambda driver: driver.find_element_by_tag_name('body'))
 
     def login_as(self, username, password):
-        self.selenium.get('%s%s' % (self.live_server_url, '/'))
+        self.selenium.get('%s%s' % (self.live_server_url, reverse('home')))
         self.waitforload()
         username_input = self.selenium.find_element_by_name("username")
         username_input.send_keys(username)

help/templatetags/help_markdown.py

@@ -1,19 +1,21 @@
 from django import template
+from django.core.urlresolvers import reverse
 import markdown
 
 register = template.Library()
 
 
 @register.simple_tag
 def markdown_file(filename):
+    base_url = reverse('help.views.home')
     with open(filename) as f:
         out = markdown.markdown(
             text=f.read(),
             extensions=[
                 'fenced_code',
                 'nl2br',
                 'headerid',
-                'wikilinks(base_url=/help/)'
+                'wikilinks(base_url=' + base_url + ')'
             ],
             safe_mode='escape',
         )

help/tests.py

@@ -31,9 +31,10 @@ def test_help_home(self):
             self.assertTemplateUsed(resp, 'help_markdown.html')
 
     def test_help_markdown(self):
+        helplink = reverse('help.views.markdown', args=('Test_Link',))
         with self.settings(HELP_SYSTEM_FILES=self.tmpdir):
             resp = self.client.get(reverse('help.views.markdown', args=('Test',)))
-            self.assertContains(resp, "<p><a class=\"wikilink\" href=\"/help/Test_Link/\">Test Link</a></p>",
+            self.assertContains(resp, '<p><a class="wikilink" href="' + helplink + '">Test Link</a></p>',
                     html=True, count=1)
             self.assertEqual(resp.context['file'], self.testfile)
             self.assertTemplateUsed(resp, 'help_markdown.html')

ratticweb/settings.py

@@ -1,5 +1,6 @@
 from datetime import timedelta
 from ConfigParser import RawConfigParser, NoOptionError
+from urlparse import urljoin
 import ldap
 import os
 from django_auth_ldap.config import LDAPSearch
@@ -103,10 +104,9 @@ def confgetbool(section, var, default):
 ROOT_URLCONF = 'ratticweb.urls'
 
 # Urls
-RATTIC_ROOT_URL = confget('ratticweb', 'urlroot', '/')
-MEDIA_URL = RATTIC_ROOT_URL +'media/'
-STATIC_URL = RATTIC_ROOT_URL +'static/'
-
+RATTIC_ROOT_URL = config.get('ratticweb', 'urlroot')
+MEDIA_URL = urljoin(RATTIC_ROOT_URL, 'media/')
+STATIC_URL = urljoin(RATTIC_ROOT_URL, 'static/')
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'ratticweb.wsgi.application'
@@ -192,8 +192,8 @@ def confgetbool(section, var, default):
 CRED_ICON_CLEAR = 'rattic/img/clear.gif'
 CRED_ICON_DEFAULT = 'Key.png'
 
-LOGIN_REDIRECT_URL = RATTIC_ROOT_URL + "cred/list/"
-LOGIN_URL = RATTIC_ROOT_URL + "account/login/"
+LOGIN_REDIRECT_URL = urljoin(RATTIC_ROOT_URL, "cred/list/")
+LOGIN_URL = urljoin(RATTIC_ROOT_URL, "account/login/")
 
 AUTH_LDAP_USER_ATTR_MAP = {"email": "mail", }
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {}