[4.0][RFC][WIP] New Toolbar Interface (for PHP)

administrator/components/com_content/View/Article/HtmlView.php

@@ -12,6 +12,10 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\Button\LinkButton;
+use Joomla\CMS\Toolbar\Button\PopupButton;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 /**
  * View to edit an article.
@@ -119,72 +123,74 @@ protected function addToolbar()
 		// Built the actions for new and existing records.
 		$canDo = $this->canDo;
 
-		\JToolbarHelper::title(
+		$toolbar = Toolbar::getInstance();
+
+		ToolbarHelper::title(
 			\JText::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))),
 			'pencil-2 article-add'
 		);
 
+		$saveGroup = $toolbar->dropdownButton('save-group');
+
 		// For new records, check the create permission.
 		if ($isNew && (count($user->getAuthorisedCategories('com_content', 'core.create')) > 0))
 		{
-			\JToolbarHelper::saveGroup(
-				[
-					['apply', 'article.apply'],
-					['save', 'article.save'],
-					['save2new', 'article.save2new']
-				],
-				'btn-success'
-			);
-
-			\JToolbarHelper::cancel('article.cancel');
+			$saveGroup->configure(
+					function (Toolbar $childBar)
+					{
+						$childBar->apply('article.apply');
+						$childBar->save('article.save');
+						$childBar->save2new('article.save2new');
+					}
+				);
 		}
 		else
 		{
 			// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
 			$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
 
-			$toolbarButtons = [];
-
-			// Can't save the record if it's checked out and editable
-			if (!$checkedOut && $itemEditable)
-			{
-				$toolbarButtons[] = ['apply', 'article.apply'];
-				$toolbarButtons[] = ['save', 'article.save'];
-
-				// We can save this record, but check the create permission to see if we can return to make a new one.
-				if ($canDo->get('core.create'))
-				{
-					$toolbarButtons[] = ['save2new', 'article.save2new'];
-				}
-			}
-
-			// If checked out, we can still save
-			if ($canDo->get('core.create'))
-			{
-				$toolbarButtons[] = ['save2copy', 'article.save2copy'];
-			}
-
-			\JToolbarHelper::saveGroup(
-				$toolbarButtons,
-				'btn-success'
-			);
+			$saveGroup->configure(
+					function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo)
+					{
+						// Can't save the record if it's checked out and editable
+						if (!$checkedOut && $itemEditable)
+						{
+							$childBar->apply('article.apply');
+							$childBar->save('article.save');
+
+							// We can save this record, but check the create permission to see if we can return to make a new one.
+							if ($canDo->get('core.create'))
+							{
+								$childBar->save2new('article.save2new');
+							}
+						}
+
+						// If checked out, we can still save
+						if ($canDo->get('core.create'))
+						{
+							$childBar->save2copy('article.save2copy');
+						}
+					}
+				);
 
 			if (\JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
 			{
-				\JToolbarHelper::versions('com_content.article', $this->item->id);
+				$toolbar->versions('com_content.article', $this->item->id);
 			}
 
 			if (!$isNew)
 			{
 				\JLoader::register('ContentHelperPreview', JPATH_ADMINISTRATOR . '/components/com_content/helpers/preview.php');
 				$url = \ContentHelperPreview::url($this->item);
-				\JToolbarHelper::preview($url, \JText::_('JGLOBAL_PREVIEW'), 'eye', 80, 90);
+				$toolbar->preview($url, \JText::_('JGLOBAL_PREVIEW'))
+					->bodyHeight(80)
+					->modalWidth(90);
 			}
-
-			\JToolbarHelper::cancel('article.cancel', 'JTOOLBAR_CLOSE');
 		}
 
-		\JToolbarHelper::divider();
-		\JToolbarHelper::help('JHELP_CONTENT_ARTICLE_MANAGER_EDIT');
+		$toolbar->cancel('article.cancel', 'JTOOLBAR_CLOSE');
+
+		$toolbar->divider();
+		$toolbar->help('JHELP_CONTENT_ARTICLE_MANAGER_EDIT');
 	}
 }

administrator/components/com_content/View/Articles/HtmlView.php

@@ -12,6 +12,12 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\Button\CustomButton;
+use Joomla\CMS\Toolbar\Button\PopupButton;
+use Joomla\CMS\Toolbar\Button\SeparatorButton;
+use Joomla\CMS\Toolbar\Button\StandardButton;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Content\Administrator\Helper\ContentHelper;
 
 /**
@@ -154,54 +160,65 @@ protected function addToolbar()
 		$user  = \JFactory::getUser();
 
 		// Get the toolbar object instance
-		$bar = \JToolbar::getInstance('toolbar');
+		$toolbar = Toolbar::getInstance('toolbar');
 
-		\JToolbarHelper::title(\JText::_('COM_CONTENT_ARTICLES_TITLE'), 'stack article');
+		ToolbarHelper::title(\JText::_('COM_CONTENT_ARTICLES_TITLE'), 'stack article');
 
 		if ($canDo->get('core.create') || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0)
 		{
-			\JToolbarHelper::addNew('article.add');
+			$toolbar->addNew('article.add');
 		}
 
 		if ($canDo->get('core.edit.state'))
 		{
-			\JToolbarHelper::publish('articles.publish', 'JTOOLBAR_PUBLISH', true);
-			\JToolbarHelper::unpublish('articles.unpublish', 'JTOOLBAR_UNPUBLISH', true);
-			\JToolbarHelper::custom('articles.featured', 'featured.png', 'featured_f2.png', 'JFEATURE', true);
-			\JToolbarHelper::custom('articles.unfeatured', 'unfeatured.png', 'featured_f2.png', 'JUNFEATURE', true);
-			\JToolbarHelper::archiveList('articles.archive');
-			\JToolbarHelper::checkin('articles.checkin');
+			$toolbar->publish('articles.publish')->listCheck(true);
+
+			$toolbar->unpublish('articles.unpublish')->listCheck(true);
+
+			$toolbar->standardButton('featured')
+				->text('JFEATURE')
+				->task('articles.featured')
+				->listCheck(true);
+
+			$toolbar->standardButton('unfeatured')
+				->text('JUNFEATURE')
+				->task('articles.unfeatured')
+				->listCheck(true);
+
+			$toolbar->archive('articles.archive')->listCheck(true);
+
+			$toolbar->checkin('articles.checkin')->listCheck(true);
 		}
 
 		// Add a batch button
 		if ($user->authorise('core.create', 'com_content')
 			&& $user->authorise('core.edit', 'com_content')
 			&& $user->authorise('core.edit.state', 'com_content'))
 		{
-			$title = \JText::_('JTOOLBAR_BATCH');
-
-			// Instantiate a new \JLayoutFile instance and render the batch button
-			$layout = new \JLayoutFile('joomla.toolbar.batch');
-
-			$dhtml = $layout->render(array('title' => $title));
-			$bar->appendButton('Custom', $dhtml, 'batch');
+			$toolbar->popupButton('batch')
+				->text('JTOOLBAR_BATCH')
+				->selector('collapseModal')
+				->listCheck(true);
 		}
 
 		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
 		{
-			\JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH');
+			$toolbar->delete('articles.delete')
+				->text('JTOOLBAR_EMPTY_TRASH')
+				->message('JGLOBAL_CONFIRM_DELETE')
+				->listCheck(true);
 		}
 		elseif ($canDo->get('core.edit.state'))
 		{
-			\JToolbarHelper::trash('articles.trash');
+			$toolbar->trash('articles.trash')->listCheck(true);
 		}
 
 		if ($user->authorise('core.admin', 'com_content') || $user->authorise('core.options', 'com_content'))
 		{
-			\JToolbarHelper::preferences('com_content');
+			$toolbar->preferences('com_content');
 		}
 
-		\JToolbarHelper::help('JHELP_CONTENT_ARTICLE_MANAGER');
+		$toolbar->help('JHELP_CONTENT_ARTICLE_MANAGER');
 	}
 
 	/**

administrator/modules/mod_toolbar/mod_toolbar.php

@@ -12,6 +12,6 @@
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Toolbar\Toolbar;
 
-$toolbar = Toolbar::getInstance('toolbar')->render('toolbar');
+$toolbar = Toolbar::getInstance('toolbar')->render();
 
 require ModuleHelper::getLayoutPath('mod_toolbar', $params->get('layout', 'default'));