Index: /enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py
===================================================================
--- /enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py	(revision 353)
+++ /enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py	(revision 354)
@@ -262,5 +262,7 @@
         self.filterDocActionImages(soup, portal.portal_url(), current)
         self.filterCSSLinks(soup, current)
+        self.filterIEFixesCSS(soup, current)
         self.filterJSLinks(soup, current)
+        self.filterS5BaseUrl(soup, current)        
         self.filterImageFullscreenBackLink(soup, current)
         links = self.getDocumentLinks(soup)
@@ -330,5 +332,7 @@
                 url = self._convertLinkToRelative(url, current)
                 x['href'] = url
-        #Filter IEFixes.css link
+
+
+    def filterIEFixesCSS(self, soup, current):
         ie_css = soup.find(text=re.compile("IEFixes.css"))
         if ie_css:
@@ -338,5 +342,5 @@
             ie_css.replaceWith('''<!--[if IE]>
                                   <style type="text/css" media="all">@import url(%s);</style>
-                                  <![endif]-->''' %nurl)
+                                  <![endif]-->''' %nurl)        
 
     def filterJSLinks(self, soup, current):
@@ -347,9 +351,18 @@
                 url = url.split(');')[0]
                 url = self._convertLinkToRelative(url, current)
-                x['src'] = url
+                x['src'] = url                
+
+    def filterS5BaseUrl(self, soup, current):
+        scripts = soup.findAll('script', type="text/javascript")
+        for x in scripts:
             if len(x.contents) > 0 and 'base' in x.contents[0]:
-                x.extract()
-                
-
+                base_url = x.contents[0].split('url="')[-1]
+                base_url = base_url.split('";')[0]
+                if '.htm' not in base_url:
+                    base_url += '.html'
+                url = self._convertLinkToRelative(base_url, current)
+                x.contents[0].replaceWith('var base_url="%s";' % url)
+ 
+        
     def getDocumentLinks(self, soup):
         tags = soup.findAll('a') + soup.findAll('link')
@@ -371,4 +384,5 @@
                 if back.has_key('href'):
                     back['href'] = current.replace('image_view_fullscreen.html', 'view.html')
+        
 
     def filterDocumentLink(self, link, current, portal, views):