libervia-web: browser_side/panels.py comparison

comparison browser_side/panels.py @ 395:98cd5387d291

browser_side: new microblogs are not using the rich text editor by default: - a button allows to switch from raw to rich text, and vice versa - raw text microblogs are not submitted anymore when the focus is lost, only when <enter> is pressed

author	souliane <souliane@mailoo.org>
date	Mon, 10 Mar 2014 22:39:26 +0100
parents	ee61b0765d6c
children	6148e9063069

comparison

equal deleted inserted replaced

-:ee61b0765d6c
+:98cd5387d291
 self._base_item = data if isinstance(data, MicroblogItem) else MicroblogItem(data)
 for attr in ['id', 'type', 'empty', 'title', 'title_xhtml', 'content', 'content_xhtml',
 'author', 'updated', 'published', 'comments', 'service', 'node',
 'comments_service', 'comments_node']:
 getter = lambda attr: lambda inst: getattr(inst._base_item, attr)
-setattr(MicroblogEntry, attr, property(getter(attr)))
+setter = lambda attr: lambda inst, value: setattr(inst._base_item, attr, value)
+setattr(MicroblogEntry, attr, property(getter(attr), setter(attr)))
 SimplePanel.__init__(self)
 self._blog_panel = blog_panel
 self.panel = FlowPanel()
 entry_avatar.setStyleName('mb_entry_avatar')
 self.avatar = Image(self._blog_panel.host.getAvatar(self.author))
 entry_avatar.add(self.avatar)
 self.panel.add(entry_avatar)
-self.entry_dialog = SimplePanel()
+self.entry_dialog = HorizontalPanel()
 self.entry_dialog.setStyleName('mb_entry_dialog')
 self.panel.add(self.entry_dialog)
 self.add(self.panel)
 ClickHandler.__init__(self)
 if sender == self:
 self._blog_panel.setSelectedEntry(self)
 elif sender == self.delete_label:
 self._delete()
 elif sender == self.update_label:
-self.bubble.edit(True)
+self.edit(True)
 elif sender == self.comment_label:
 self._comment()
 def __modifiedCb(self, content):
 """Send the new content to the backend
 """
 if not content['text']:  # previous content has been emptied
 self._delete(True)
 return False
 extra = {'published': str(self.published)}
-if self.empty or self.content_xhtml:
+if isinstance(self.bubble, richtext.RichTextEditor):
 # 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:
 self._blog_panel.removeEntry(self.type, self.id)
 if self.type == 'main_item':  # restore the "New message" button
 self._blog_panel.refresh()
 else:  # allow to create a new comment
 self._parent_entry._current_comment = None
+try:
-def __setBubble(self):
+self.toggle_syntax_button.removeFromParent()
+except TypeError:
+pass
+def __setBubble(self, edit=False):
 """Set the bubble displaying the initial content."""
 content = {'text': self.content_xhtml if self.content_xhtml else self.content,
 'title': self.title_xhtml if self.title_xhtml else self.title}
-if self.empty or self.content_xhtml:  # new message and rich text message
+if self.content_xhtml:
 content.update({'syntax': Const.SYNTAX_XHTML})
 if self.author != self._blog_panel.host.whoami.bare:
 options = ['read_only']
 else:
 options = [] if self.empty else ['update_msg']
 self.bubble = richtext.RichTextEditor(self._blog_panel.host, content, self.__modifiedCb, self.__afterEditCb, options)
 else:  # assume raw text message have no title
-self.bubble = LightTextEditor(content, self.__modifiedCb, self.__afterEditCb, True)
+self.bubble = LightTextEditor(content, self.__modifiedCb, self.__afterEditCb, single_line=True, listen_focus=False)
 self.bubble.setStyleName("bubble")
+try:
+self.toggle_syntax_button.removeFromParent()
+except TypeError:
+pass
 self.entry_dialog.add(self.bubble)
-self.bubble.edit(False)
+self.edit(edit)
 self.bubble.addEditListener(self.__showWarning)
 def __showWarning(self, sender, keycode):
 if keycode == KEY_ENTER:
 self._blog_panel.host.showWarning(None, None)
 if entry is None:
 print "The entry of id %s can not be commented" % self.id
 return
 entry._parent_entry = self
 self._current_comment = entry
-entry.bubble.edit(True)
+self.edit(True, entry)
+def edit(self, edit, entry=None):
+"""Toggle the bubble between display and edit mode
+@edit: boolean value
+@entry: MicroblogEntry instance, or None to use self
+"""
+if entry is None:
+entry = self
+try:
+entry.toggle_syntax_button.removeFromParent()
+except TypeError:
+pass
+entry.bubble.edit(edit)
+if edit:
+if isinstance(entry.bubble, richtext.RichTextEditor):
+image = '<a class="richTextIcon">A</a>'
+title = _('Switch to raw text edition')
+else:
+image = '<img src="media/icons/tango/actions/32/format-text-italic.png" class="richTextIcon"/>'
+title = _('Switch to rich text edition')
+entry.toggle_syntax_button = Button(image, entry.toggleContentSyntax)
+entry.toggle_syntax_button.setTitle(title)
+entry.entry_dialog.add(entry.toggle_syntax_button)
+def toggleContentSyntax(self):
+"""Toggle the editor between raw and rich text"""
+original_content = self.bubble.getOriginalContent()
+rich = not isinstance(self.bubble, richtext.RichTextEditor)
+def setBubble(text):
+self.content = text
+self.content_xhtml = text if rich else ''
+self.content_title = self.content_title_xhtml = ''
+self.bubble.removeFromParent()
+self.__setBubble(True)
+self.bubble.setOriginalContent(original_content)
+text = self.bubble.getContent()['text']
+if not text:
+setBubble(' ')  # something different than empty string is needed to initialize the rich text editor
+return
+if not rich:
+def confirm_cb(answer):
+if answer:
+self._blog_panel.host.bridge.call('syntaxConvert', setBubble, text, Const.SYNTAX_CURRENT, Const.SYNTAX_TEXT)
+dialog.ConfirmDialog(confirm_cb, text=_("Do you really want to lose the title and text formatting?")).show()
+else:
+self._blog_panel.host.bridge.call('syntaxConvert', setBubble, text, Const.SYNTAX_TEXT, Const.SYNTAX_XHTML)
 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.bubble.edit(True)
+entry.edit(True)
 self.new_button = Button("New message", listener=addBox)
 self.new_button.setStyleName("microblogNewButton")
 self.vpanel.insert(self.new_button, 0)
 @classmethod
 EMPTY_STATUS = '&lt;click to set a status&gt;'
 def __init__(self, host, status=''):
 self.host = host
 modifiedCb = lambda content: self.host.bridge.call('setStatus', None, self.host.status_panel.presence, content['text']) or True
-LightTextEditor.__init__(self, {'text': status}, modifiedCb, None, True)
+LightTextEditor.__init__(self, {'text': status}, modifiedCb, None, single_line=True)
 self.edit(False)
 self.setStyleName('statusPanel')
 ClickHandler.__init__(self)
 self.addClickListener(self)

Mercurial > libervia-web

comparison browser_side/panels.py @ 395:98cd5387d291