libervia-web: browser_side/panels.py comparison

comparison browser_side/panels.py @ 351:c943fd54c90e

browser_side: heavy refactorisation for microblogs: - RichTextEditor inheritates from BaseTextEditor - stuff related to display/edition have been moved from MicroblogEntry to LightTextEditor and RichTextEditor. Now the editors has two modes for display/edition and the microblog bubble is actually the editor itself. - RichTextEditor's display mode uses a LightTextEditor (this will be used for WYSIWYG edition) - addressing stuff of RichTextEditor have been moved to a child class RichMessageEditor (used for the rich text editor when clicking on the button left to the unibox) - handle blog titles TODO: - fix encode/decode errors when sending special chars - fix images maximal width in the bubble - rich content WYSIWYG edition

author	souliane <souliane@mailoo.org>
date	Wed, 12 Feb 2014 15:17:04 +0100
parents	f1b9ec412769
children	f4efffb9627c

comparison

equal deleted inserted replaced

-:f1b9ec412769
+:c943fd54c90e
 def refresh(self):
 """Enable or disable this panel. Contained widgets are created when necessary."""
 enable = self.host.params_ui['unibox']['value']
 self.setVisible(enable)
 if enable and not self.unibox:
-self.button = Button ('<img src="media/icons/tango/actions/32/format-text-italic.png" class="richTextIcon"/>')
+self.button = Button('<img src="media/icons/tango/actions/32/format-text-italic.png" class="richTextIcon"/>')
 self.button.setTitle('Open the rich text editor')
 self.button.addStyleName('uniBoxButton')
 self.add(self.button)
 self.unibox = UniBox(self.host)
 self.add(self.unibox)
 self.setCellWidth(self.unibox, '100%')
-self.button.addClickListener(self.openRichTextEditor)
+self.button.addClickListener(self.openRichMessageEditor)
 self.unibox.addKey("@@: ")
-def openRichTextEditor(self):
+def openRichMessageEditor(self):
 """Open the rich text editor."""
 self.button.setVisible(False)
 self.unibox.setVisible(False)
 self.setCellWidth(self.unibox, '0px')
 self.host.panel._contactsMove(self)
-def onCloseCallback():
+def afterEditCb():
 Window.removeWindowResizeListener(self)
 self.host.panel._contactsMove(self.host.panel._hpanel)
 self.setCellWidth(self.unibox, '100%')
 self.button.setVisible(True)
 self.unibox.setVisible(True)
 self.host.resize()
-richtext.RichTextEditor.getOrCreate(self.host, self, onCloseCallback)
+richtext.RichMessageEditor.getOrCreate(self.host, self, afterEditCb)
 Window.addWindowResizeListener(self)
 self.host.resize()
 def onWindowResized(self, width, height):
 right = self.host.panel.menu.getAbsoluteLeft() + self.host.panel.menu.getOffsetWidth()
 def __init__(self, data):
 self.id = data['id']
 self.type = data.get('type', 'main_item')
 self.empty = data.get('new', False)
+self.title = data.get('title', '')
+self.title_xhtml = data.get('title_xhtml', '')
 self.content = data.get('content', '')
-self.xhtml = data.get('xhtml', '')
+self.content_xhtml = data.get('content_xhtml', '')
 self.author = data['author']
 self.updated = float(data.get('updated', 0))  # XXX: int doesn't work here
 try:
 self.published = float(data['published'])  # XXX: int doesn't work here
 except KeyError:
 self.add(self.panel)
 ClickHandler.__init__(self)
 self.addClickListener(self)
 self.pub_data = (self.hash[0], self.hash[1], self.id)
-self._setContent()
+self.__setContent()
-def _setContent(self):
+def __setContent(self):
 """Actually set the entry content (header, icons, bubble...)"""
 self.delete_label = self.update_label = self.comment_label = None
-self.bubble = self.editbox = self._current_comment = None
+self.bubble = self._current_comment = None
-self._setHeader()
+self.__setHeader()
-if self.empty:
+self.__setBubble()
-self.editable_content = ['', Const.SYNTAX_XHTML]
+self.__setIcons()
-else:
-self.editable_content = [self.xhtml, Const.SYNTAX_XHTML] if self.xhtml else [self.content, None]
+def __setHeader(self):
-self.setEntryDialog()
-self._setIcons()
-def _setHeader(self):
 """Set the entry header"""
 if self.empty:
 return
 update_text = u" — ✍ " + "<span class='mb_entry_timestamp'>%s</span>" % datetime.fromtimestamp(self.updated)
 self.header.setHTML("""<div class='mb_entry_header'>
 'published': datetime.fromtimestamp(self.published),
 'updated': update_text if self.published != self.updated else ''
 }
 )
-def _setIcons(self):
+def __setIcons(self):
 """Set the entry icons (delete, update, comment)"""
 if self.empty:
 return
 def addIcon(label, title):
 if sender == self:
 self._blog_panel.setSelectedEntry(self)
 elif sender == self.delete_label:
 self._delete()
 elif sender == self.update_label:
-self.setEntryDialog(edit=True)
+self.bubble.edit(True)
 elif sender == self.comment_label:
 self._comment()
-def onKeyUp(self, sender, keycode, modifiers):
+def __modifiedCb(self, content):
-"""Update is done when ENTER key is pressed within the raw editbox"""
+"""Send the new content to the backend
-if sender != self.editbox or not self.editbox.getVisible():
+@return: False to restore the original content if a deletion has been cancelled
-return
+"""
-if keycode == KEY_ENTER:
+if not content['text']:  # previous content has been emptied
-self._updateContent()
+self._delete(True)
+return False
-def onLostFocus(self, sender):
-"""Update is done when the focus leaves the raw editbox"""
-if sender != self.editbox or not self.editbox.getVisible():
-return
-self._updateContent()
-def _updateContent(self, cancel=False):
-"""Send the new content to the backend, remove the entry if it was
-an empty one (used for creating a new blog post)"""
-if not self.editbox or not self.editbox.getVisible():
-return
-self.entry_dialog.setWidth("auto")
-self.entry_dialog.remove(self.edit_panel)
-self.entry_dialog.add(self.bubble)
-new_text = self.editbox.getText().strip()
-self.edit_panel = self.editbox = None
-def removeNewEntry():
-if self.empty:
-self._blog_panel.removeEntry(self.type, self.id)
-if self.type == 'main_item':  # restore the "New message" button
-self._blog_panel.setUniBox(enable=False)
-else:  # allow to create a new comment
-self._parent_entry._current_comment = None
-if cancel or new_text == self.editable_content[0] or new_text == "":
-removeNewEntry()
-return
-self.editable_content[0] = new_text
 extra = {'published': str(self.published)}
-if self.empty or self.xhtml:
+if self.empty or self.content_xhtml:
-extra.update({'rich': new_text})
+# TODO: if the user change his parameters after the message edition started,
+# the message syntax could be different then the current syntax: pass the
+# message syntax in extra for the frontend to use it instead of current syntax.
+extra.update({'content_rich': content['text'], 'title': content['title']})
 if self.empty:
 if self.type == 'main_item':
-self._blog_panel.host.bridge.call('sendMblog', None, None, self._blog_panel.accepted_groups, new_text, extra)
+self._blog_panel.host.bridge.call('sendMblog', None, None, self._blog_panel.accepted_groups, content['text'], extra)
 else:
-self._blog_panel.host.bridge.call('sendMblogComment', None, self._parent_entry.comments, new_text, extra)
+self._blog_panel.host.bridge.call('sendMblogComment', None, self._parent_entry.comments, content['text'], extra)
 else:
-self._blog_panel.host.bridge.call('updateMblog', None, self.pub_data, self.comments, new_text, extra)
+self._blog_panel.host.bridge.call('updateMblog', None, self.pub_data, self.comments, content['text'], extra)
-removeNewEntry()
+return True
-def setEntryDialog(self, edit=False):
+def __afterEditCb(self, content):
-"""Set the bubble or the editor
+"""Remove the entry if it was an empty one (used for creating a new blog post).
-@param edit: set to True to display the editor"""
+Data for the actual new blog post will be received from the bridge"""
-if edit:
+if self.empty:
-if self.editbox and self.editbox.getVisible():
+self._blog_panel.removeEntry(self.type, self.id)
-self.editbox.setFocus(True)
+if self.type == 'main_item':  # restore the "New message" button
-return
+self._blog_panel.refresh()
-if self.empty or self.xhtml:
+else:  # allow to create a new comment
-def cb(result):
+self._parent_entry._current_comment = None
-self._updateContent(result == richtext.CANCEL)
+def __setBubble(self):
-options = ['no_recipient', 'no_sync_unibox', 'no_style', 'no_close']
+"""Set the bubble displaying the initial content."""
-if not self.empty:
+content = {'text': self.content_xhtml if self.content_xhtml else self.content,
-options.append('update_msg')
+'title': self.title_xhtml if self.title_xhtml else self.title}
-editor = richtext.RichTextEditor(self._blog_panel.host, self.panel, cb, options=options)
+if self.empty or self.content_xhtml:  # new message and rich text message
-editor.setWidth('100%')
+content.update({'syntax': Const.SYNTAX_XHTML})
-self.editbox = editor.textarea
+if self.author != self._blog_panel.host.whoami.bare:
-editor.setVisible(True)  # needed to build the toolbar
+options = ['read_only']
-if self.editable_content[0]:
-self._blog_panel.host.bridge.call('syntaxConvert', lambda d: self._setOriginalText(d, editor),
-self.editable_content[0], self.editable_content[1])
-else:
-self._setOriginalText("", editor)
 else:
-if not self.editbox:
+options = [] if self.empty else ['update_msg']
-self.editbox = TextArea()
+self.bubble = richtext.RichTextEditor(self._blog_panel.host, content, self.__modifiedCb, self.__afterEditCb, options)
-self.editbox.addFocusListener(self)
+else:  # assume raw text message have no title
-self.editbox.addKeyboardListener(self)
+self.bubble = LightTextEditor(content, self.__modifiedCb, self.__afterEditCb, True)
-self._setOriginalText(self.editable_content[0], self.editbox)
+self.bubble.setStyleName("bubble")
-else:
+self.entry_dialog.add(self.bubble)
-if not self.bubble:
+self.bubble.edit(False)
-self.bubble = HTML()
-self.bubble.setStyleName("bubble")
+def _delete(self, empty=False):
+"""Ask confirmation for deletion.
-self.bubble.setHTML(addURLToText(html_sanitize(self.content)) if not self.xhtml else self.xhtml)
+@return: False if the deletion has been cancelled."""
-self.entry_dialog.add(self.bubble)
-def _setOriginalText(self, text, container):
-"""Set the original text to be modified in the editor"""
-text = text.strip()
-container.original_text = text
-self.editbox.setWidth('100%')
-self.editbox.setText(text)
-panel = SimplePanel()
-panel.add(container)
-panel.setStyleName("bubble")
-panel.addStyleName('bubble-editbox')
-if self.bubble:
-self.entry_dialog.remove(self.bubble)
-self.entry_dialog.add(panel)
-self.editbox.setFocus(True)
-if text:
-self.editbox.setSelectionRange(len(text), 0)
-self.edit_panel = panel
-self.editable_content = [text, container.format if isinstance(container, richtext.RichTextEditor) else None]
-def _delete(self):
-"""Ask confirmation for deletion"""
 def confirm_cb(answer):
 if answer:
 self._blog_panel.host.bridge.call('deleteMblog', None, self.pub_data, self.comments)
+else:  # restore the text if it has been emptied during the edition
-target = 'message and all its comments' if self.comments else 'comment'
+self.bubble.setContent(self.bubble._original_content)
-_dialog = dialog.ConfirmDialog(confirm_cb, text="Do you really want to delete this %s?" % target)
-_dialog.show()
+if self.empty:
+text = _("New ") + (_("message") if self.comments else _("comment")) + _(" without body has been cancelled.")
+dialog.InfoDialog(_("Information"), text).show()
+return
+text = ""
+if empty:
+text = (_("Message") if self.comments else _("Comment")) + _(" body has been emptied.<br/>")
+target = _('message and all its comments') if self.comments else _('comment')
+text += _("Do you really want to delete this %s?") % target
+dialog.ConfirmDialog(confirm_cb, text=text).show()
 def _comment(self):
 """Add an empty entry for a new comment"""
 if self._current_comment:
-self._current_comment.editbox.setFocus(True)
+self._current_comment.bubble.setFocus(True)
 return
 data = {'id': str(time()),
 'new': True,
 'type': 'comment',
 'author': self._blog_panel.host.whoami.bare,
 'node': self.node
 }
 entry = self._blog_panel.addEntry(data)
 entry._parent_entry = self
 self._current_comment = entry
-entry.setEntryDialog(edit=True)
+entry.bubble.edit(True)
 class MicroblogPanel(base_widget.LiberviaWidget):
 warning_msg_public = "This message will be PUBLIC and everybody will be able to see it, even people you don't know"
 warning_msg_group = "This message will be published for all the people of the group <span class='warningTarget'>%s</span>"
 data = {'id': str(time()),
 'new': True,
 'author': self.host.whoami.bare,
 }
 entry = self.addEntry(data)
-entry.setEntryDialog(edit=True)
+entry.bubble.edit(True)
 self.new_button = Button("New message", listener=addBox)
 self.new_button.setStyleName("microblogNewButton")
 self.vpanel.insert(self.new_button, 0)
 @classmethod

Mercurial > libervia-web

comparison browser_side/panels.py @ 351:c943fd54c90e