Changeset 537

Timestamp:

08/07/09 10:17:29 (4 years ago)

Author:

david

Message:

adding additional logic to handle different types of link paths i

Location:

enpraxis.staticsite/trunk/enpraxis/staticsite

Files:

• browser/controlpanel.py (modified) (1 diff)
• utilities/staticsiteutility.py (modified) (1 diff)

enpraxis.staticsite/trunk/enpraxis/staticsite/browser/controlpanel.py

@@ -113 +113 @@
 
     def set_deployment_path(self, dp):
+        if not dp.endswith('/'):
+            dp += '/'
         self.ssprops.manage_changeProperties(deployment_path=dp)
 

enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py

@@ -473 +473 @@
                 tags = soup.findAll('link', {'href' : re.compile(x)})
                 for tag in tags:
-                    abs_link = self._convertLinkToAbsolute(tag['href'], portal_url)
-                    rel_link = self._convertLinkToRelative(abs_link, current)
+                    if portal_url in tag['href'] or len(tag['href'].split('/')) == 1:                    
+                        abs_link = self._convertLinkToAbsolute(tag['href'], portal_url)
+                        rel_link = self._convertLinkToRelative(abs_link, current)
+                    else:
+                        rel_link = tag['href']                        
                     tag['href']  = rel_link.replace(x, 'css/%s' % x) 
             elif 'javascript' in ftype:              
                 tags = soup.findAll('script', {'src' : re.compile(x)})
                 for tag in tags:
-                    abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)
-                    rel_link = self._convertLinkToRelative(abs_link, current)                    
+                    if portal_url in tag['src'] or len(tag['src'].split('/')) == 1:
+                        abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)
+                        rel_link = self._convertLinkToRelative(abs_link, current)                    
+                    else:
+                        rel_link = tag['src']                        
                     tag['src']  = rel_link.replace(x, 'js/%s' % x)  
             elif 'image' in ftype:
                 tags = soup.findAll('img', {'src' : re.compile(x)})
                 for tag in tags:
-                    abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)                    
-                    rel_link = self._convertLinkToRelative(abs_link, current)
+                    if portal_url in tag['src'] or len(tag['src'].split('/')) == 1:
+                        abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)                    
+                        rel_link = self._convertLinkToRelative(abs_link, current)                    
+                    else:
+                        rel_link = tag['src']
                     tag['src']  = rel_link.replace(x, 'images/%s' % x)