Cleaned up the publish button logic on page toolbar

Author: czpython

cms/cms_toolbars.py

@@ -12,7 +12,7 @@
 from cms.api import get_page_draft, can_change_page
 from cms.constants import TEMPLATE_INHERITANCE_MAGIC, PUBLISHER_STATE_PENDING
 from cms.models import CMSPlugin, Title, Page
-from cms.toolbar.items import TemplateItem, REFRESH_PAGE
+from cms.toolbar.items import ButtonList, TemplateItem, REFRESH_PAGE
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
 from cms.utils.i18n import get_language_tuple, force_language, get_language_dict, get_default_language
@@ -364,25 +364,30 @@ def has_dirty_objects(self):
     def add_publish_button(self, classes=('cms-btn-action', 'cms-btn-publish',)):
         # only do dirty lookups if publish permission is granted else button isn't added anyway
         if self.toolbar.edit_mode and self.has_publish_permission():
-            classes = list(classes or [])
-            dirty = self.has_dirty_objects()
+            button = self.get_publish_button(classes=classes)
+            self.toolbar.add_item(button)
 
-            if dirty:
-                classes.append('cms-btn-publish-active')
+    def get_publish_button(self, classes=None):
+        dirty = self.has_dirty_objects()
+        classes = list(classes or [])
 
-            if self.dirty_statics or (self.page and self.page.is_published(self.current_lang)):
-                title = _('Publish page changes')
-            else:
-                title = _('Publish page now')
-                classes.append('cms-publish-page')
-
-            self.toolbar.add_button(
-                name=title,
-                url=self.get_publish_url(),
-                extra_classes=classes,
-                side=self.toolbar.RIGHT,
-                disabled=not dirty,
-            )
+        if dirty and 'cms-btn-publish-active' not in classes:
+            classes.append('cms-btn-publish-active')
+
+        if self.dirty_statics or (self.page and self.page.is_published(self.current_lang)):
+            title = _('Publish page changes')
+        else:
+            title = _('Publish page now')
+            classes.append('cms-publish-page')
+
+        item = ButtonList(side=self.toolbar.RIGHT)
+        item.add_button(
+            title,
+            url=self.get_publish_url(),
+            disabled=not dirty,
+            extra_classes=classes,
+        )
+        return item
 
     def get_publish_url(self):
         pk = self.page.pk if self.page else 0