Changeset 535 for enpraxis.staticsite

Timestamp:

08/06/09 17:45:26 (3 years ago)

Author:

david

Message:

updated to more generic filtering of assets

Files:

• enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py (modified) (6 diffs)

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

@@ -343 +343 @@
         self.filterIgnoredPortlets(soup, ssprops)        
         self.filterIgnoredActions(soup, ssprops)
-        self.filterDocActionImages(soup, portal.portal_url(), current)
         self.filterCSSLinks(soup, current)
         self.filterIEFixesCSS(soup, current)
-        self.filterJSLinks(soup, current)
         self.filterS5BaseUrl(soup, current)        
         self.filterBaseFilesLinks(soup, current, portal, ssprops)
@@ -402 +400 @@
                     column_wrapper.parent.extract()
                 
-    def filterDocActionImages(self, soup, portal_url, current):
-        tags = soup.findAll('li')
-        for x in tags:
-            if x.has_key('id'):
-                id = x['id']
-                if 'document-action' in id:                    
-                    for z in x.findAll('img'):
-                        src = z['src']
-                        surl = '%s/%s' % (portal_url, src)
-                        url = self._convertLinkToRelative(surl, current)                        
-                        z['src'] = url
-
     def filterCSSLinks(self, soup, current):
         #There are 2 cases, importing stylesheets, and linked stylesheets
@@ -445 +431 @@
                                   <![endif]-->''' %nurl)        
 
-    def filterJSLinks(self, soup, current):
-        scripts = soup.findAll('script', type="text/javascript")
-        for x in scripts:
-            if x.has_key('src') == True:
-                url = x['src']
-                url = url.split(');')[0]
-                url = self._convertLinkToRelative(url, current)
-                x['src'] = url                
-
     def filterS5BaseUrl(self, soup, current):
         scripts = soup.findAll('script', type="text/javascript")
@@ -496 +473 @@
                 tags = soup.findAll('link', {'href' : re.compile(x)})
                 for tag in tags:
-                    abs_link = self._convertLinkToAbsolute(tag['href'], current)
+                    abs_link = self._convertLinkToAbsolute(tag['href'], portal_url)
                     rel_link = self._convertLinkToRelative(abs_link, current)
                     tag['href']  = rel_link.replace(x, 'css/%s' % x) 
@@ -502 +479 @@
                 tags = soup.findAll('script', {'src' : re.compile(x)})
                 for tag in tags:
-                    abs_link = self._convertLinkToAbsolute(tag['src'], current)
+                    abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)
                     rel_link = self._convertLinkToRelative(abs_link, current)                    
                     tag['src']  = rel_link.replace(x, 'js/%s' % x)  
@@ -508 +485 @@
                 tags = soup.findAll('img', {'src' : re.compile(x)})
                 for tag in tags:
-                    abs_link = self._convertLinkToAbsolute(tag['src'], current)                    
-                    rel_link = self._convertLinkToRelative(tag['src'], current)
+                    abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)                    
+                    rel_link = self._convertLinkToRelative(abs_link, current)
                     tag['src']  = rel_link.replace(x, 'images/%s' % x)
-
-
-
 
     def getDocumentLinks(self, soup):