Move edit to dropdown

joomla · May 17, 2017 · fbaf616 · fbaf616
1 parent d5a3df8
commit fbaf616
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/administrator/components/com_content/View/Articles/Html.php b/administrator/components/com_content/View/Articles/Html.php
@@ -156,11 +156,6 @@ protected function addToolbar()
 			\JToolbarHelper::addNew('article.add');
 		}
 
-		if (($canDo->get('core.edit')) || ($canDo->get('core.edit.own')))
-		{
-			\JToolbarHelper::editList('article.edit');
-		}
-
 		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
 		{
 			\JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH');

diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php
@@ -82,6 +82,7 @@
 										</a>
 										<div class="dropdown-menu">
 											<?php if ($canDo->get('core.edit.state')) { ?>
+											<a class="dropdown-item" onclick="if (document.adminForm.boxchecked.value == 0) { Joomla.renderMessages({'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}) } else { Joomla.submitbutton('article.edit'); }"><?php echo JText::_('JTOOLBAR_EDIT'); ?></a>
 											<a class="dropdown-item" onclick="if (document.adminForm.boxchecked.value == 0) { Joomla.renderMessages({'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}) } else { Joomla.submitbutton('articles.publish'); }"><?php echo JText::_('JTOOLBAR_PUBLISH'); ?></a>
 											<a class="dropdown-item" onclick="if (document.adminForm.boxchecked.value == 0) { Joomla.renderMessages({'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}) } else { Joomla.submitbutton('articles.unpublish'); }"><?php echo JText::_('JTOOLBAR_UNPUBLISH'); ?></a>
 											<a class="dropdown-item" onclick="if (document.adminForm.boxchecked.value == 0) { Joomla.renderMessages({'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}) } else { Joomla.submitbutton('articles.featured'); }"><?php echo JText::_('JFEATURE'); ?></a>

diff --git a/administrator/templates/atum/css/template.css b/administrator/templates/atum/css/template.css
@@ -10218,6 +10218,8 @@ iframe {
     width: 2.3rem;
     font-size: 1.3rem;
     color: #464a4c; }
+  .table-row-actions .dropdown-item.active, .table-row-actions .dropdown-item:active {
+    background-color: #636c72; }
 
 .chzn-container.chzn-container-single .chzn-single {
   display: inline-block;

diff --git a/administrator/templates/atum/css/template.css.map b/administrator/templates/atum/css/template.css.map
diff --git a/administrator/templates/atum/css/template.min.css b/administrator/templates/atum/css/template.min.css
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
@@ -41,4 +41,7 @@
     font-size: 1.3rem;
     color: $gray;
   }
+  .dropdown-item.active, .dropdown-item:active {
+    background-color: $gray-light;
+  }
 }