Small fixes and changes in qwebcontentedit and ICapContent.

- content preview's html code is now cleaner
 - ICapContent.preview_content() renamed to ICapContent.get_content_preview()
 - tab "preview" was shown first when starting qwebcontentedit. Fixed.

weboob/applications/qwebcontentedit/main_window.py

@@ -30,6 +30,7 @@ class MainWindow(QtMainWindow):
 
         self.config = config
         self.weboob = weboob
+        self.backend = None
 
         self.connect(self.ui.idEdit, SIGNAL("returnPressed()"), self.loadPage)
         self.connect(self.ui.loadButton, SIGNAL("clicked()"), self.loadPage)
@@ -39,16 +40,17 @@ self._currentTabChanged)
 
     def _currentTabChanged(self):
         if self.ui.tabWidget.currentIndex() == 1:
-            self.showPreview()
+            if self.backend is not None:
+                self.showPreview()
         return
 
     def loadPage(self):
-        id = unicode(self.ui.idEdit.text())
+        _id = unicode(self.ui.idEdit.text())
-        if not id:
+        if not _id:
             return
 
         for backend in self.weboob.iter_backends():
-            self.content = backend.get_content(id)
+            self.content = backend.get_content(_id)
             if self.content:
                 self.ui.contentEdit.setPlainText(self.content.content)
                 self.backend = backend
@@ -56,7 +58,7 @@ self._currentTabChanged)
 
 
     def savePage(self):
-        if not hasattr(self, "backend"):
+        if self.backend is None:
             return
         new_content = unicode(self.ui.contentEdit.toPlainText())
         if new_content != self.content.content:
@@ -75,5 +77,5 @@ self._currentTabChanged)
         print backtrace
 
     def showPreview(self):
-        self.ui.previewEdit.setHtml(self.backend.preview_content(self.content))
+        self.ui.previewEdit.setHtml(self.backend.get_content_preview(self.content))
         return

weboob/applications/qwebcontentedit/ui/main_window.ui

@@ -32,7 +32,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">

weboob/backends/redmine/backend.py

@@ -73,7 +73,7 @@ class RedmineBackend(BaseBackend, ICapContent):
         with self.browser:
             return self.browser.set_wiki_source(project, page, content.content, message)
 
-    def preview_content(self, content):
+    def get_content_preview(self, content):
         try:
             _type, project, page = self.id2path(content.id)
         except ValueError:
@@ -81,5 +81,3 @@ class RedmineBackend(BaseBackend, ICapContent):
 
         with self.browser:
             return self.browser.get_wiki_preview(project, page, content.content)
-
-

weboob/backends/redmine/browser.py

@@ -18,6 +18,7 @@
 
 from urlparse import urlsplit
 import urllib
+import lxml.html
 
 from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
 
@@ -77,12 +78,18 @@ class RedmineBrowser(BaseBrowser):
         self.page.set_source(data, message)
 
     def get_wiki_preview(self, project, page, data):
-        if not self.is_on_page(WikiEditPage) or self.page.groups[0] != project \
+        if (not self.is_on_page(WikiEditPage) or self.page.groups[0] != project 
-                or self.page.groups[1] != page:
+            or self.page.groups[1] != page):
             self.location('%s/projects/%s/wiki/%s/edit' % (self.BASEPATH,
                                                            project, page))
         url = '%s/projects/%s/wiki/%s/preview' % (self.BASEPATH, project, page)
         params = {}
         params['content[text]'] = data.encode('utf-8')
         params['authenticity_token'] = "%s" % self.page.get_authenticity_token()
-        return self.readurl(url, urllib.urlencode(params))
+        preview_html = lxml.html.fragment_fromstring(self.readurl(url,
+                                                    urllib.urlencode(params)),
+                                                    create_parent='div')
+        preview_html.find("fieldset").drop_tag()
+        preview_html.find("legend").drop_tree()
+        return lxml.html.tostring(preview_html)
+        

weboob/capabilities/content.py

@@ -36,5 +36,5 @@ class ICapContent(IBaseCap):
     def push_content(self, content, message=None):
         raise NotImplementedError()
     
-    def preview_content(self, content):
+    def get_content_preview(self, content):
         raise NotImplementedError()