From 52f3e4e48fc521245273723e1156295969a51d21 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 4 Jan 2019 22:26:39 +0100 Subject: [PATCH 0001/1831] Making CategoryNode and MenuItem ImmutableNodes --- libraries/src/Categories/CategoryNode.php | 33 +++- libraries/src/Menu/MenuItem.php | 173 ++++++++++++++---- libraries/src/Menu/SiteMenu.php | 3 + libraries/src/Tree/ImmutableNodeInterface.php | 2 +- 4 files changed, 175 insertions(+), 36 deletions(-) diff --git a/libraries/src/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php index 7d1c4d8c6d474..825185547ce39 100644 --- a/libraries/src/Categories/CategoryNode.php +++ b/libraries/src/Categories/CategoryNode.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Tree\NodeInterface; use Joomla\Registry\Registry; /** @@ -19,7 +20,7 @@ * * @since 1.6 */ -class CategoryNode extends CMSObject +class CategoryNode extends CMSObject implements NodeInterface { /** * Primary key @@ -296,7 +297,7 @@ class CategoryNode extends CMSObject /** * Constructor of this tree * - * @var CategoryNode + * @var Categories * @since 1.6 */ protected $_constructor = null; @@ -304,8 +305,8 @@ class CategoryNode extends CMSObject /** * Class constructor * - * @param array $category The category data. - * @param CategoryNode $constructor The tree constructor. + * @param array $category The category data. + * @param Categories $constructor The tree constructor. * * @since 1.6 */ @@ -581,6 +582,30 @@ public function getPath() return $this->_path; } + /** + * Get the root of the tree + * + * @return CategoryNode + * + * @since __DEPLOY_VERSION__ + */ + public function getRoot() + { + $root = $this->getParent(); + + if (!$root) + { + return $this; + } + + while ($root->getParent()) + { + $root = $root->getParent(); + } + + return $root; + } + /** * Returns the user that created the category * diff --git a/libraries/src/Menu/MenuItem.php b/libraries/src/Menu/MenuItem.php index 0aa78b0eb8471..e7fb31c45d8a3 100644 --- a/libraries/src/Menu/MenuItem.php +++ b/libraries/src/Menu/MenuItem.php @@ -10,6 +10,8 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Menu\AbstractMenu; +use Joomla\CMS\Tree\ImmutableNodeInterface; use Joomla\Registry\Registry; /** @@ -18,7 +20,7 @@ * @since 3.7.0 * @note This class will no longer extend stdClass in Joomla 4 */ -class MenuItem extends \stdClass +class MenuItem extends \stdClass implements ImmutableNodeInterface { /** * Primary key @@ -189,6 +191,14 @@ class MenuItem extends \stdClass */ public $query = array(); + /** + * The constructor of this node to retrieve other parts of the tree + * + * @var AbstractMenu + * @since __DEPLOY_VERSION__ + */ + protected $constructor; + /** * Class constructor * @@ -205,66 +215,167 @@ public function __construct($data = array()) } /** - * Method to get certain otherwise inaccessible properties from the form field object. + * Method to clean up the object before serialisation + * + * @return array An array of object vars + * + * @since __DEPLOY_VERSION__ + */ + public function __sleep() + { + $this->constructor = null; + + return array_keys(get_object_vars($this)); + } + + /** + * Method to set the constructor of this node to retrieve other parts of the tree * - * @param string $name The property name for which to get the value. + * @param AbstractMenu $constructor Constructor * - * @return mixed The property value or null. + * @return void * - * @since 3.7.0 - * @deprecated 4.0 Access the item parameters through the `getParams()` method + * @since __DEPLOY_VERSION__ + */ + public function setMenuConstructor(AbstractMenu $constructor) + { + $this->constructor = $constructor; + } + + /** + * Get the children of this node + * + * @param boolean $recursive False by default + * + * @return NodeInterface[] The children + * + * @since __DEPLOY_VERSION__ */ - public function __get($name) + public function &getChildren($recursive = false) { - if ($name === 'params') + $children = $this->constructor->getItems('parent_id', $this->id); + + if ($recursive) { - return $this->getParams(); + $items = array(); + + foreach ($children as $child) + { + $items[] = $child; + $items = array_merge($items, $child->getChildren(true)); + } + + return $items; } - return $this->get($name); + return $children; } /** - * Method to set certain otherwise inaccessible properties of the form field object. - * - * @param string $name The property name for which to set the value. - * @param mixed $value The value of the property. + * Get the parent of this node * - * @return void + * @return NodeInterface|null * - * @since 3.7.0 - * @deprecated 4.0 Set the item parameters through the `setParams()` method + * @since __DEPLOY_VERSION__ + */ + public function getParent() + { + if ($this->parent_id != 1) + { + return $this->constructor->getItem($this->parent_id); + } + + return null; + } + + /** + * Get the root of the tree + * + * @return NodeInterface + * + * @since __DEPLOY_VERSION__ */ - public function __set($name, $value) + public function getRoot() { - if ($name === 'params') + $root = $this->getParent(); + + if (!$root) { - $this->setParams($value); + return $this; + } - return; + while ($root->getParent()) + { + $root = $root->getParent(); } - $this->set($name, $value); + return $root; + } + + /** + * Test if this node has children + * + * @return boolean True if there is a child + * + * @since __DEPLOY_VERSION__ + */ + public function hasChildren() + { + return (bool) count($this->getChildren()); + } + + /** + * Test if this node has a parent + * + * @return boolean True if there is a parent + * + * @since __DEPLOY_VERSION__ + */ + public function hasParent() + { + return $this->parent_id > 1 ? true : false; } /** - * Method check if a certain otherwise inaccessible properties of the form field object is set. + * Returns the right or left sibling of a node * - * @param string $name The property name to check. + * @param boolean $right If set to false, returns the left sibling * - * @return boolean + * @return NodeInterface|null NodeInterface object of the sibling. * - * @since 3.7.1 - * @deprecated 4.0 Deprecated without replacement + * @since __DEPLOY_VERSION__ */ - public function __isset($name) + public function getSibling($right = true) { - if ($name === 'params') + $children = $this->constructor->getItems('parent_id', $this->parent_id); + + $prev = null; + $found = false; + + foreach ($children as $child) { - return !($this->params instanceof Registry); + // The previous child is our current node and we want the right node + if ($found) + { + return $child; + } + + // We found the current node + if ($child->id == $this->id) + { + // We want the left node + if (!$right) + { + return $prev; + } + + $found = true; + } + + $prev = $child; } - return $this->get($name) !== null; + return null; } /** diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php index dc1f4d009702f..65d2ddff3e09d 100644 --- a/libraries/src/Menu/SiteMenu.php +++ b/libraries/src/Menu/SiteMenu.php @@ -124,6 +124,9 @@ public function load() foreach ($this->getMenu() as &$item) { + // Set the constructor + $item->setMenuConstructor($this); + // Get parent information. $parent_tree = array(); diff --git a/libraries/src/Tree/ImmutableNodeInterface.php b/libraries/src/Tree/ImmutableNodeInterface.php index 4a2c296a89113..802b25cb3ed54 100644 --- a/libraries/src/Tree/ImmutableNodeInterface.php +++ b/libraries/src/Tree/ImmutableNodeInterface.php @@ -40,7 +40,7 @@ public function getParent(); /** * Get the root of the tree * - * @return NodeInterface + * @return ImmutableNodeInterface * * @since __DEPLOY_VERSION__ */ From c70602b73c58e6cfdad41bcae68dedd6b02d2dda Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 5 Jan 2019 00:51:54 +0100 Subject: [PATCH 0002/1831] Adding ImmutableNodeTrait, NodeTrait Optimising CategoryNode, MenuItem Improving menu item discovery in routing --- libraries/src/Categories/CategoryNode.php | 190 ++-------------------- libraries/src/Menu/MenuItem.php | 177 ++++---------------- libraries/src/Menu/SiteMenu.php | 4 +- libraries/src/Router/SiteRouter.php | 77 ++++----- libraries/src/Tree/ImmutableNodeTrait.php | 159 ++++++++++++++++++ libraries/src/Tree/NodeInterface.php | 6 +- libraries/src/Tree/NodeTrait.php | 108 ++++++++++++ 7 files changed, 358 insertions(+), 363 deletions(-) create mode 100644 libraries/src/Tree/ImmutableNodeTrait.php create mode 100644 libraries/src/Tree/NodeTrait.php diff --git a/libraries/src/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php index 825185547ce39..c81b24dd7e8d1 100644 --- a/libraries/src/Categories/CategoryNode.php +++ b/libraries/src/Categories/CategoryNode.php @@ -13,6 +13,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Tree\NodeInterface; +use Joomla\CMS\Tree\NodeTrait; use Joomla\Registry\Registry; /** @@ -22,6 +23,8 @@ */ class CategoryNode extends CMSObject implements NodeInterface { + use NodeTrait; + /** * Primary key * @@ -246,22 +249,6 @@ class CategoryNode extends CMSObject implements NodeInterface */ public $assets = null; - /** - * Parent Category object - * - * @var CategoryNode - * @since 1.6 - */ - protected $_parent = null; - - /** - * Array of Children - * - * @var CategoryNode[] - * @since 1.6 - */ - protected $_children = array(); - /** * Path from root to this category * @@ -270,22 +257,6 @@ class CategoryNode extends CMSObject implements NodeInterface */ protected $_path = array(); - /** - * Category left of this one - * - * @var CategoryNode - * @since 1.6 - */ - protected $_leftSibling = null; - - /** - * Category right of this one - * - * @var CategoryNode - * @since 1.6 - */ - protected $_rightSibling = null; - /** * Flag if all children have been loaded * @@ -338,74 +309,31 @@ public function __construct($category = null, $constructor = null) * * @since 1.6 */ - public function setParent($parent) + public function setParent(NodeInterface $parent) { - if ($parent instanceof CategoryNode || is_null($parent)) + if (!is_null($this->_parent)) { - if (!is_null($this->_parent)) - { - $key = array_search($this, $this->_parent->_children); - unset($this->_parent->_children[$key]); - } - - if (!is_null($parent)) - { - $parent->_children[] = & $this; - } - - $this->_parent = $parent; + $key = array_search($this, $this->_parent->_children); + unset($this->_parent->_children[$key]); + } - if ($this->id != 'root') - { - if ($this->parent_id != 1) - { - $this->_path = $parent->getPath(); - } + $this->_parent = $parent; - $this->_path[$this->id] = $this->id . ':' . $this->alias; - } + $this->_parent->_children[] = & $this; - if (count($parent->_children) > 1) - { - end($parent->_children); - $this->_leftSibling = prev($parent->_children); - $this->_leftSibling->_rightsibling = & $this; - } + if (count($this->_parent->_children) > 1) + { + end($this->_parent->_children); + $this->_leftSibling = prev($this->_parent->_children); + $this->_leftSibling->_rightsibling = & $this; } - } - /** - * Add child to this node - * - * If the child already has a parent, the link is unset - * - * @param CategoryNode $child The child to be added. - * - * @return void - * - * @since 1.6 - */ - public function addChild($child) - { - if ($child instanceof CategoryNode) + if ($this->parent_id != 1) { - $child->setParent($this); + $this->_path = $parent->getPath(); } - } - /** - * Remove a specific child - * - * @param integer $id ID of a category - * - * @return void - * - * @since 1.6 - */ - public function removeChild($id) - { - $key = array_search($this, $this->_parent->_children); - unset($this->_parent->_children[$key]); + $this->_path[$this->id] = $this->id . ':' . $this->alias; } /** @@ -448,64 +376,6 @@ public function &getChildren($recursive = false) return $this->_children; } - /** - * Get the parent of this node - * - * @return CategoryNode - * - * @since 1.6 - */ - public function getParent() - { - return $this->_parent; - } - - /** - * Test if this node has children - * - * @return boolean True if there is a child - * - * @since 1.6 - */ - public function hasChildren() - { - return count($this->_children); - } - - /** - * Test if this node has a parent - * - * @return boolean True if there is a parent - * - * @since 1.6 - */ - public function hasParent() - { - return $this->getParent() != null; - } - - /** - * Function to set the left or right sibling of a category - * - * @param CategoryNode $sibling CategoryNode object for the sibling - * @param boolean $right If set to false, the sibling is the left one - * - * @return void - * - * @since 1.6 - */ - public function setSibling($sibling, $right = true) - { - if ($right) - { - $this->_rightSibling = $sibling; - } - else - { - $this->_leftSibling = $sibling; - } - } - /** * Returns the right or left sibling of a category * @@ -582,30 +452,6 @@ public function getPath() return $this->_path; } - /** - * Get the root of the tree - * - * @return CategoryNode - * - * @since __DEPLOY_VERSION__ - */ - public function getRoot() - { - $root = $this->getParent(); - - if (!$root) - { - return $this; - } - - while ($root->getParent()) - { - $root = $root->getParent(); - } - - return $root; - } - /** * Returns the user that created the category * diff --git a/libraries/src/Menu/MenuItem.php b/libraries/src/Menu/MenuItem.php index e7fb31c45d8a3..8f37367a1df0d 100644 --- a/libraries/src/Menu/MenuItem.php +++ b/libraries/src/Menu/MenuItem.php @@ -11,17 +11,19 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Menu\AbstractMenu; -use Joomla\CMS\Tree\ImmutableNodeInterface; +use Joomla\CMS\Tree\NodeInterface; +use Joomla\CMS\Tree\NodeTrait; use Joomla\Registry\Registry; /** * Object representing a menu item * * @since 3.7.0 - * @note This class will no longer extend stdClass in Joomla 4 */ -class MenuItem extends \stdClass implements ImmutableNodeInterface +class MenuItem implements NodeInterface { + use NodeTrait; + /** * Primary key * @@ -191,14 +193,6 @@ class MenuItem extends \stdClass implements ImmutableNodeInterface */ public $query = array(); - /** - * The constructor of this node to retrieve other parts of the tree - * - * @var AbstractMenu - * @since __DEPLOY_VERSION__ - */ - protected $constructor; - /** * Class constructor * @@ -215,167 +209,66 @@ public function __construct($data = array()) } /** - * Method to clean up the object before serialisation + * Method to get certain otherwise inaccessible properties from the form field object. * - * @return array An array of object vars + * @param string $name The property name for which to get the value. * - * @since __DEPLOY_VERSION__ - */ - public function __sleep() - { - $this->constructor = null; - - return array_keys(get_object_vars($this)); - } - - /** - * Method to set the constructor of this node to retrieve other parts of the tree - * - * @param AbstractMenu $constructor Constructor - * - * @return void + * @return mixed The property value or null. * - * @since __DEPLOY_VERSION__ - */ - public function setMenuConstructor(AbstractMenu $constructor) - { - $this->constructor = $constructor; - } - - /** - * Get the children of this node - * - * @param boolean $recursive False by default - * - * @return NodeInterface[] The children - * - * @since __DEPLOY_VERSION__ + * @since 3.7.0 + * @deprecated 4.0 Access the item parameters through the `getParams()` method */ - public function &getChildren($recursive = false) + public function __get($name) { - $children = $this->constructor->getItems('parent_id', $this->id); - - if ($recursive) + if ($name === 'params') { - $items = array(); - - foreach ($children as $child) - { - $items[] = $child; - $items = array_merge($items, $child->getChildren(true)); - } - - return $items; + return $this->getParams(); } - return $children; + return $this->get($name); } /** - * Get the parent of this node + * Method to set certain otherwise inaccessible properties of the form field object. * - * @return NodeInterface|null + * @param string $name The property name for which to set the value. + * @param mixed $value The value of the property. * - * @since __DEPLOY_VERSION__ - */ - public function getParent() - { - if ($this->parent_id != 1) - { - return $this->constructor->getItem($this->parent_id); - } - - return null; - } - - /** - * Get the root of the tree - * - * @return NodeInterface - * - * @since __DEPLOY_VERSION__ + * @return void + * + * @since 3.7.0 + * @deprecated 4.0 Set the item parameters through the `setParams()` method */ - public function getRoot() + public function __set($name, $value) { - $root = $this->getParent(); - - if (!$root) + if ($name === 'params') { - return $this; - } + $this->setParams($value); - while ($root->getParent()) - { - $root = $root->getParent(); + return; } - return $root; - } - - /** - * Test if this node has children - * - * @return boolean True if there is a child - * - * @since __DEPLOY_VERSION__ - */ - public function hasChildren() - { - return (bool) count($this->getChildren()); - } - - /** - * Test if this node has a parent - * - * @return boolean True if there is a parent - * - * @since __DEPLOY_VERSION__ - */ - public function hasParent() - { - return $this->parent_id > 1 ? true : false; + $this->set($name, $value); } /** - * Returns the right or left sibling of a node + * Method check if a certain otherwise inaccessible properties of the form field object is set. * - * @param boolean $right If set to false, returns the left sibling + * @param string $name The property name to check. * - * @return NodeInterface|null NodeInterface object of the sibling. + * @return boolean * - * @since __DEPLOY_VERSION__ + * @since 3.7.1 + * @deprecated 4.0 Deprecated without replacement */ - public function getSibling($right = true) + public function __isset($name) { - $children = $this->constructor->getItems('parent_id', $this->parent_id); - - $prev = null; - $found = false; - - foreach ($children as $child) + if ($name === 'params') { - // The previous child is our current node and we want the right node - if ($found) - { - return $child; - } - - // We found the current node - if ($child->id == $this->id) - { - // We want the left node - if (!$right) - { - return $prev; - } - - $found = true; - } - - $prev = $child; + return !($this->params instanceof Registry); } - return null; + return $this->get($name) !== null; } /** diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php index 65d2ddff3e09d..4eeb4af09b429 100644 --- a/libraries/src/Menu/SiteMenu.php +++ b/libraries/src/Menu/SiteMenu.php @@ -124,14 +124,12 @@ public function load() foreach ($this->getMenu() as &$item) { - // Set the constructor - $item->setMenuConstructor($this); - // Get parent information. $parent_tree = array(); if (isset($this->getMenu()[$item->parent_id])) { + $item->setParent($this->getMenu()[$item->parent_id]); $parent_tree = $this->getMenu()[$item->parent_id]->tree; } diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php index b0666252ec423..5949c4940dd78 100644 --- a/libraries/src/Router/SiteRouter.php +++ b/libraries/src/Router/SiteRouter.php @@ -225,55 +225,46 @@ public function parseSefRoute(&$router, &$uri) else { // Get menu items. - $items = $this->menu->getMenu(); + $items = $this->menu->getItems('parent_id', 1); + $lang_tag = $this->app->getLanguage()->getTag(); + $found = null; - $found = false; - $route_lowercase = StringHelper::strtolower($route); - $lang_tag = $this->app->getLanguage()->getTag(); - - // Iterate through all items and check route matches. - foreach ($items as $item) + foreach ($segments as $segment) { - if ($item->route && StringHelper::strpos($route_lowercase . '/', $item->route . '/') === 0 && $item->type !== 'menulink') + $matched = false; + + foreach ($items as $item) { - // Usual method for non-multilingual site. - if (!$this->app->getLanguageFilter()) - { - // Exact route match. We can break iteration because exact item was found. - if ($item->route === $route_lowercase) - { - $found = $item; - break; - } - - // Partial route match. Item with highest level takes priority. - if (!$found || $found->level < $item->level) - { - $found = $item; - } - } - // Multilingual site. - elseif ($item->language === '*' || $item->language === $lang_tag) + if ($item->alias == $segment + && (!$this->app->getLanguageFilter() + || ($item->language === '*' + || $item->language === $lang_tag))) { - // Exact route match. - if ($item->route === $route_lowercase) - { - $found = $item; - - // Break iteration only if language is matched. - if ($item->language === $lang_tag) - { - break; - } - } - - // Partial route match. Item with highest level or same language takes priority. - if (!$found || $found->level < $item->level || $item->language === $lang_tag) - { - $found = $item; - } + $found = $item; + $matched = true; + $items = $item->getChildren(); + break; } } + + if (!$matched) + { + break; + } + } + + // Menu links are not valid URLs. Find the first parent that isn't a menulink + if ($found->type == 'menulink') + { + while ($found->hasParent() && $found->type == 'menulink') + { + $found = $found->getParent(); + } + + if ($found->type == 'menulink') + { + $found = null; + } } if (!$found) diff --git a/libraries/src/Tree/ImmutableNodeTrait.php b/libraries/src/Tree/ImmutableNodeTrait.php new file mode 100644 index 0000000000000..7d153607e4a41 --- /dev/null +++ b/libraries/src/Tree/ImmutableNodeTrait.php @@ -0,0 +1,159 @@ +_children as $child) + { + $items[] = $child; + $items = array_merge($items, $child->getChildren(true)); + } + + return $items; + } + + return $this->_children; + } + + /** + * Get the parent of this node + * + * @return NodeInterface|null + * + * @since __DEPLOY_VERSION__ + */ + public function getParent() + { + return $this->_parent; + } + + /** + * Get the root of the tree + * + * @return ImmutableNodeInterface + * + * @since __DEPLOY_VERSION__ + */ + public function getRoot() + { + $root = $this->getParent(); + + if (!$root) + { + return $this; + } + + while ($root->hasParent()) + { + $root = $root->getParent(); + } + + return $root; + } + + /** + * Test if this node has children + * + * @return boolean True if there is a child + * + * @since __DEPLOY_VERSION__ + */ + public function hasChildren() + { + return (bool) count($this->_children); + } + + /** + * Test if this node has a parent + * + * @return boolean True if there is a parent + * + * @since __DEPLOY_VERSION__ + */ + public function hasParent() + { + return $this->getParent() != null; + } + + /** + * Returns the right or left sibling of a node + * + * @param boolean $right If set to false, returns the left sibling + * + * @return NodeInterface|null NodeInterface object of the sibling. + * + * @since __DEPLOY_VERSION__ + */ + public function getSibling($right = true) + { + if ($right) + { + return $this->_rightSibling; + } + else + { + return $this->_leftSibling; + } + } +} diff --git a/libraries/src/Tree/NodeInterface.php b/libraries/src/Tree/NodeInterface.php index aa29b51385eb9..d709dc4657147 100644 --- a/libraries/src/Tree/NodeInterface.php +++ b/libraries/src/Tree/NodeInterface.php @@ -28,7 +28,7 @@ interface NodeInterface extends ImmutableNodeInterface * * @since __DEPLOY_VERSION__ */ - public function setParent($parent); + public function setParent(NodeInterface $parent); /** * Add child to this node @@ -41,7 +41,7 @@ public function setParent($parent); * * @since __DEPLOY_VERSION__ */ - public function addChild($child); + public function addChild(NodeInterface $child); /** * Remove a specific child @@ -64,5 +64,5 @@ public function removeChild($id); * * @since __DEPLOY_VERSION__ */ - public function setSibling($sibling, $right = true); + public function setSibling(NodeInterface $sibling, $right = true); } diff --git a/libraries/src/Tree/NodeTrait.php b/libraries/src/Tree/NodeTrait.php new file mode 100644 index 0000000000000..b6edea1f6ded6 --- /dev/null +++ b/libraries/src/Tree/NodeTrait.php @@ -0,0 +1,108 @@ +_parent)) + { + $key = array_search($this, $this->_parent->_children); + unset($this->_parent->_children[$key]); + } + + $this->_parent = $parent; + + $this->_parent->_children[] = & $this; + + if (count($this->_parent->_children) > 1) + { + end($this->_parent->_children); + $this->_leftSibling = prev($this->_parent->_children); + $this->_leftSibling->_rightsibling = & $this; + } + } + + /** + * Add child to this node + * + * If the child already has a parent, the link is unset + * + * @param NodeInterface $child The child to be added. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function addChild(NodeInterface $child) + { + $child->setParent($this); + } + + /** + * Remove a specific child + * + * @param integer $id ID of a node + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function removeChild($id) + { + $key = array_search($this, $this->_parent->_children); + unset($this->_parent->_children[$key]); + } + + /** + * Function to set the left or right sibling of a node + * + * @param NodeInterface $sibling NodeInterface object for the sibling + * @param boolean $right If set to false, the sibling is the left one + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function setSibling(NodeInterface $sibling, $right = true) + { + if ($right) + { + $this->_rightSibling = $sibling; + } + else + { + $this->_leftSibling = $sibling; + } + } +} From 0f9040d7033b503344a40af19236c4a871d70d6b Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 5 Jan 2019 11:31:44 +0100 Subject: [PATCH 0003/1831] Fixing typo --- libraries/src/Tree/NodeTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Tree/NodeTrait.php b/libraries/src/Tree/NodeTrait.php index b6edea1f6ded6..cb5cb228abb44 100644 --- a/libraries/src/Tree/NodeTrait.php +++ b/libraries/src/Tree/NodeTrait.php @@ -49,7 +49,7 @@ public function setParent(NodeInterface $parent) { end($this->_parent->_children); $this->_leftSibling = prev($this->_parent->_children); - $this->_leftSibling->_rightsibling = & $this; + $this->_leftSibling->_rightSibling = & $this; } } From ac272c7345a39f5f0cfcb30ca391aeb1e98c7ced Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 8 Jan 2019 09:46:46 +0100 Subject: [PATCH 0004/1831] Fixing reference bug --- libraries/src/Tree/NodeTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Tree/NodeTrait.php b/libraries/src/Tree/NodeTrait.php index b6edea1f6ded6..6958b59ddc26b 100644 --- a/libraries/src/Tree/NodeTrait.php +++ b/libraries/src/Tree/NodeTrait.php @@ -49,7 +49,7 @@ public function setParent(NodeInterface $parent) { end($this->_parent->_children); $this->_leftSibling = prev($this->_parent->_children); - $this->_leftSibling->_rightsibling = & $this; + $this->_leftSibling->_rightsibling = $this; } } From c288b3144f23d19017094e5ca101b2889becc482 Mon Sep 17 00:00:00 2001 From: fancyFranci Date: Sat, 12 Jan 2019 19:42:28 +0100 Subject: [PATCH 0005/1831] edit upper toolbar buttons and dropdowns --- .../language/en-GB/en-GB.com_categories.ini | 1 + .../language/en-GB/en-GB.mod_status.ini | 8 ++ .../modules/mod_status/tmpl/default.php | 130 +++++++++++++----- .../templates/atum/scss/_variables.scss | 6 +- .../templates/atum/scss/blocks/_header.scss | 36 ++++- 5 files changed, 143 insertions(+), 38 deletions(-) diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini index 8f5b823b67c1b..2f271f149cdc7 100644 --- a/administrator/language/en-GB/en-GB.com_categories.ini +++ b/administrator/language/en-GB/en-GB.com_categories.ini @@ -12,6 +12,7 @@ COM_CATEGORIES_BATCH_TIP="If a category is selected for move/copy, any actions s COM_CATEGORIES_CATEGORIES_BASE_TITLE="Categories" COM_CATEGORIES_CATEGORIES_TITLE="%s: Categories" COM_CATEGORIES_CATEGORY_ADD_TITLE="%s: New Category" +COM_CATEGORIES_CATEGORY_BASE_ADD_TITLE="New Category" COM_CATEGORIES_CATEGORY_EDIT_TITLE="%s: Edit Category" COM_CATEGORIES_CHANGE_CATEGORY="Select or Change Category" COM_CATEGORIES_DELETE_NOT_ALLOWED="Delete not allowed for category %s." diff --git a/administrator/language/en-GB/en-GB.mod_status.ini b/administrator/language/en-GB/en-GB.mod_status.ini index 468884337e67b..457b556066518 100644 --- a/administrator/language/en-GB/en-GB.mod_status.ini +++ b/administrator/language/en-GB/en-GB.mod_status.ini @@ -4,15 +4,23 @@ ; Note : All ini files need to be saved as UTF-8 MOD_STATUS="User Status" +MOD_STATUS_ACCESSIBILITY_SETTINGS="Accessibility Settings" MOD_STATUS_BACKEND_USERS_0="Administrators" MOD_STATUS_BACKEND_USERS_1="Administrator" MOD_STATUS_BACKEND_USERS_MORE="Administrators" +MOD_STATUS_BE_HAPPY="Be Happy" +MOD_STATUS_CREATE_CATEGORY="Create Category" +MOD_STATUS_CREATE_NEWSLETTER="Create Newsletter" +MOD_STATUS_CLEAR_CACHE="Clear Cache" MOD_STATUS_EDIT_ACCOUNT="Edit Account" MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_ADMIN_LABEL="Logged-in Backend Users" MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_LABEL="Logged-in Users" +MOD_STATUS_QUICKSTART="Quickstart" +MOD_STATUS_QUICKSTART_HEADER="Quickstart" MOD_STATUS_POST_INSTALLATION_MESSAGES="Post-installation messages" MOD_STATUS_PREVIEW="Preview %s" MOD_STATUS_PRIVATE_MESSAGES="Private Messages" +MOD_STATUS_NEW_ARTICLE="New Article" MOD_STATUS_TOTAL_USERS_0="Users" MOD_STATUS_TOTAL_USERS_1="User" MOD_STATUS_TOTAL_USERS_MORE="Users" diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 3eefab3ea4aa9..df174fbccd0bf 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -37,21 +37,65 @@
  • - - - - + + + + +
  • - - - - getSession()->get('messages.unread'); ?> - 0) : ?> - - - + + + + + +
    +
    + + +
    + authorise('core.edit', 'com_content')) : ?> + +
    + + + + +
    + + authorise('core.edit', 'com_categories')) : ?> + +
    + + + + +
    + + authorise('core.manage', 'com_cache')) : ?> + +
    + + +
    + + authorise('core.edit', 'com_newsfeeds')) : ?> + +
    + + + + +
    + +
    + + + + +
    +
    • authorise('core.manage', 'com_postinstall')) : ?> @@ -59,45 +103,61 @@ + 0) : ?> -
    -
    - -

    - -

    - - - -
    title_key), 28, false, false); ?>
    -

    - description_key), 120, false, false); ?> -

    -     - -
    -
    +
    +
    + + +
    + +
    +

    +
    + + +
    + + title_key), 28, false, false); ?> + + postinstall_message_id; ?> + + + + +
    + +
  • - + +
    - name; ?>
    id; ?> - - - +
    + + +
    +
    + + +
    +
    + + + +
    • diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index cdd8ce7a3ad83..120d9aa67e5ab 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -36,8 +36,10 @@ $theme-colors: map-merge(( ), $theme-colors); $colors: ( - primary-dark: #2b5c91, - main-bg: #ebeff5, + primary-dark: #2b5c91, + primary-light: #3a87cb, + primary-bright: #45a0f1, + main-bg: #ebeff5, success-border: darken(theme-color("success"), 5%), info-border: darken(theme-color("info"), 7%), warning-border: darken(theme-color("warning"), 5%), diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss index b7a3a54384c50..e0f3dee4acbc6 100644 --- a/administrator/templates/atum/scss/blocks/_header.scss +++ b/administrator/templates/atum/scss/blocks/_header.scss @@ -27,10 +27,11 @@ .nav-link { position: relative; padding: 0; + margin: 0 1rem; line-height: $header-height; + min-width: $header-height - 5px; .fa { - width: $header-height + 2px; font-size: 1.2rem; color: var(--primary-dark); vertical-align: middle; @@ -53,21 +54,54 @@ } } + .link-title { + text-decoration: underline; + } + .dropdown-menu { min-width: 280px; padding: 0; border: 0; z-index: 1041; + background-color: var(--primary-light); h2 { font-size: $h5-font-size; } + + .dropdown-message { + font-weight: bold; + color: $gray-900; + } } .dropdown-item { + color: $white; + background-color: var(--primary-light); + @include hover-focus { color: var(--primary-dark); } + + a { + display: inline-block; + width: 100%; + color: $white; + + &:hover { + color: var(--primary-dark); + text-decoration: none; + } + + .fa { + float: right; + } + } + + .fa { + padding: 0.6rem; + background-color: var(--primary-bright); + } } .dropdown-menu::after { From 7f5cdd5fffc494b425df5618028002a25f8e9ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lavinia=20Popa-R=C3=B6ssel?= Date: Mon, 14 Jan 2019 21:53:18 +0100 Subject: [PATCH 0006/1831] adjusted style for the action buttons in the upper toolbar. Added background to nav-items when hovered and when dropdown-items are shown. Removed icons from dropdown-headers. Positioned and styled icons. Changed order in html-dom for the last dropdown, so the icons are part of the link and the whole line is clickable. --- .../modules/mod_status/tmpl/default.php | 32 +++++++------ .../templates/atum/scss/blocks/_header.scss | 47 ++++++++++++++++--- 2 files changed, 59 insertions(+), 20 deletions(-) diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index df174fbccd0bf..6485dd3a01b35 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -52,7 +52,6 @@
    -
    authorise('core.edit', 'com_content')) : ?> @@ -110,7 +109,6 @@
    -
    @@ -119,12 +117,12 @@
    -
    +
    title_key), 28, false, false); ?> postinstall_message_id; ?> - + @@ -141,22 +139,28 @@
    -
    +
    name; ?>
    id; ?> -
    - - +
    + + + +
    -
    - - +
    + + + +
    -
    - +
    - + + + +
    diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss index e0f3dee4acbc6..ead0dfca8e5e4 100644 --- a/administrator/templates/atum/scss/blocks/_header.scss +++ b/administrator/templates/atum/scss/blocks/_header.scss @@ -24,10 +24,15 @@ } } + .nav-item:hover, + .nav-item.show { + background-color: var(--main-bg); + } + .nav-link { position: relative; padding: 0; - margin: 0 1rem; + margin: 0 0.6rem; line-height: $header-height; min-width: $header-height - 5px; @@ -78,6 +83,7 @@ .dropdown-item { color: $white; background-color: var(--primary-light); + padding: 0; @include hover-focus { color: var(--primary-dark); @@ -87,6 +93,8 @@ display: inline-block; width: 100%; color: $white; + padding-left: 0.75rem; + line-height: 3; &:hover { color: var(--primary-dark); @@ -99,8 +107,31 @@ } .fa { - padding: 0.6rem; - background-color: var(--primary-bright); + padding: 1rem; + background-color: lighten(color("primary-light"), 5%); + width: 3rem; + } + + &.closeMessageWrapper > a:first-child { + width: calc(100% - 3.5rem); + } + + .closeMessage { + float: right; + padding: 0; + width: 3rem; + } + + &.iconsLeft { + + a { + padding-left: 0; + } + + .fa { + float: left; + margin-right: 0.75rem; + } } } @@ -125,11 +156,15 @@ } .dropdown-header { - padding-top: .5rem; - padding-bottom: .5rem; - color: $white; background-color: var(--primary-dark); box-shadow: $atum-box-shadow; + color: $white; + font-size: inherit; + padding: 1rem 0.75rem; + + &.iconsLeftHeader { + padding-left: 3.75rem; + } } .list-group-item-text:last-child { From 30ad8c7616b7b4fedd874b37aba6868777aff29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lavinia=20Popa-R=C3=B6ssel?= Date: Tue, 15 Jan 2019 16:48:34 +0100 Subject: [PATCH 0007/1831] code style changed to tabs and removed white spaces --- .../modules/mod_status/tmpl/default.php | 252 ++++++++++-------- 1 file changed, 140 insertions(+), 112 deletions(-) diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 6485dd3a01b35..ddaed55c12adb 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -24,11 +24,13 @@
      - + - + @@ -37,133 +39,159 @@
    • - - - - - + + + + +
    • - + - - - -
      -
      - -
      - authorise('core.edit', 'com_content')) : ?> - -
      - - - - -
      - - authorise('core.edit', 'com_categories')) : ?> - -
      - - - - -
      - - authorise('core.manage', 'com_cache')) : ?> - -
      - - -
      - - authorise('core.edit', 'com_newsfeeds')) : ?> - -
      - - - - -
      - -
      - - - - -
      -
      + + + +
      +
      + +
      + authorise('core.edit', 'com_content')) : ?> + +
      + + + + +
      + + authorise('core.edit', 'com_categories')) : ?> + +
      + + + + +
      + + authorise('core.manage', 'com_cache')) : ?> + +
      + + +
      + + authorise('core.edit', 'com_newsfeeds')) : ?> + +
      + + + + +
      + +
      + + + + +
      +
      • authorise('core.manage', 'com_postinstall')) : ?> -
    • - - - - - 0) : ?> - - - -
      -
      - -
      - -
      -

      -
      - - -
      - - title_key), 28, false, false); ?> - - postinstall_message_id; ?> - - - - -
      - -
      -
      • +
    • + + + + + 0) : ?> + + + + + +
      +
      + +
      + +
      +

      +
      + + +
      + + title_key), 28, false, + false); ?> + + postinstall_message_id; ?> + + + + +
      + +
      +
    • - + - - + +
      name; ?>
      - id; ?> -
      - - - - -
      -
      - - - - -
      -
      - - - - - -
      + id; ?> +
      + + + + +
      +
      + + + + +
      +
      + + + + + +
      • -
    From 43d72bc6ded9c326e8d633d7411463cf0cde5490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lavinia=20Popa-R=C3=B6ssel?= Date: Tue, 15 Jan 2019 17:09:29 +0100 Subject: [PATCH 0008/1831] code style changed removed white spaces and changed to tab --- .../modules/mod_status/tmpl/default.php | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index ddaed55c12adb..7a25a220b319a 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -40,12 +40,14 @@
  • + title="" + target="_blank"> + class="sr-only"> + +
    • @@ -55,7 +57,9 @@ class="sr-only">"> + class="sr-only"> + +
    @@ -68,7 +72,9 @@ class="sr-only">
    - +
    @@ -78,7 +84,8 @@ class="sr-only">
    - +
    @@ -95,14 +102,16 @@ class="sr-only">
    - +
    - +
    @@ -111,10 +120,13 @@ class="sr-only"> authorise('core.manage', 'com_postinstall')) : ?>
  • + data-toggle="dropdown" + title=""> - + + + 0) : ?> @@ -146,9 +158,12 @@ class="sr-only"> - + + class="sr-only"> + +
    • @@ -158,10 +173,12 @@ class="sr-only">
  • + title=""> + class="sr-only"> + +
    From 8ee895457b736873aebd282d42c1c448fcdde58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lavinia=20Popa-R=C3=B6ssel?= Date: Tue, 15 Jan 2019 17:20:57 +0100 Subject: [PATCH 0009/1831] code style again :D --- .../modules/mod_status/tmpl/default.php | 92 +++++-------------- 1 file changed, 25 insertions(+), 67 deletions(-) diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 7a25a220b319a..590a41958ba93 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -29,8 +29,7 @@ - + @@ -43,11 +42,7 @@ title="" target="_blank"> - - - +
    • @@ -56,10 +51,7 @@ class="sr-only"> - - - +
    @@ -67,51 +59,42 @@ class="sr-only">
    authorise('core.edit', 'com_content')) : ?> - +
    - +
    authorise('core.edit', 'com_categories')) : ?> - +
    - +
    authorise('core.manage', 'com_cache')) : ?>
    - - +
    authorise('core.edit', 'com_newsfeeds')) : ?> - +
    - +
    - +
    @@ -119,19 +102,13 @@ class="sr-only"> authorise('core.manage', 'com_postinstall')) : ?>
  • - - - - + 0) : ?> - - - +
    @@ -145,25 +122,14 @@ class="sr-only">
    - - title_key), 28, false, - false); ?> - - postinstall_message_id; ?> - + title_key), 28, false, false); ?> + + postinstall_message_id; ?> + - - - - + +
    @@ -175,19 +141,12 @@ class="sr-only"> - - - +
    -
    - name; ?> -
    - id; ?> +
    name; ?>
    + id; ?>
    @@ -201,8 +160,7 @@ class="sr-only">
    - + From 34c264b223e5e0a62397c89c5a05bc104d6144f5 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Sat, 19 Jan 2019 12:16:29 +0100 Subject: [PATCH 0010/1831] mixin for fadeeffect on login page --- administrator/templates/atum/scss/_mixin.scss | 66 ++++++++++ .../templates/atum/scss/_variables.scss | 3 + .../templates/atum/scss/template.scss | 12 ++ .../scss/client.css | 114 ++++++++++++++++++ .../scss/client.min.css | 1 + libraries/--autoload_psr4.php | 107 ++++++++++++++++ package-lock.json | 12 +- templates/system/build_incomplete.html | 2 +- templates/system/incompatible.html | 2 +- 9 files changed, 311 insertions(+), 8 deletions(-) create mode 100644 administrator/templates/atum/scss/_mixin.scss create mode 100644 build/media_src/plg_installer_webinstaller/scss/client.css create mode 100644 build/media_src/plg_installer_webinstaller/scss/client.min.css create mode 100644 libraries/--autoload_psr4.php diff --git a/administrator/templates/atum/scss/_mixin.scss b/administrator/templates/atum/scss/_mixin.scss new file mode 100644 index 0000000000000..a06668e11eebd --- /dev/null +++ b/administrator/templates/atum/scss/_mixin.scss @@ -0,0 +1,66 @@ +@mixin prefix_fadeout{ + from { opacity: 1; } + to { opacity: 0; } +} + +@mixin fadeout_page{ + /* Firefox < 16 */ + @-moz-keyframes fadeout { + @include prefix_fadeout; + } + /* Safari, Chrome and Opera > 12.1 */ + @-webkit-keyframes fadeout { + @include prefix_fadeout; + } + /* Internet Explorer */ + @-ms-keyframes fadeout { + @include prefix_fadeout; + } + /* Opera < 12.1 */ + @-o-keyframes fadeout { + @include prefix_fadeout; + } + @keyframes fadeout { + @include prefix_fadeout; + } + + -webkit-animation: fadeout $fadetime; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadeout $fadetime; /* Firefox < 16 */ + -ms-animation: fadeout $fadetime; /* Internet Explorer */ + -o-animation: fadeout $fadetime; /* Opera < 12.1 */ + animation: fadeout $fadetime; +} + +@mixin prefix_fadein{ + from { opacity: 0; } + to { opacity: 1; } +} + +@mixin fadein_page{ + /* Firefox < 16 */ + @-moz-keyframes fadein { + @include prefix_fadein; + } + /* Safari, Chrome and Opera > 12.1 */ + @-webkit-keyframes fadein { + @include prefix_fadein; + } + /* Internet Explorer */ + @-ms-keyframes fadein { + @include prefix_fadein; + } + /* Opera < 12.1 */ + @-o-keyframes fadein { + @include prefix_fadein; + } + @keyframes fadein { + @include prefix_fadein; + } + + -webkit-animation: fadein $fadetime; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadein $fadetime; /* Firefox < 16 */ + -ms-animation: fadein $fadetime; /* Internet Explorer */ + -o-animation: fadein $fadetime; /* Opera < 12.1 */ + animation: fadein $fadetime; + +} \ No newline at end of file diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 99f351a691984..a7efd22a1b3f5 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -193,3 +193,6 @@ $breadcrumb-bg: var(--white); // Links $link-color: var(--primary); $link-hover-color: var(--link-hover); + +//Time for fadeeffect login-light-bg +$fadetime: 5s; diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss index bd0e8032156c3..d1e29b3826901 100644 --- a/administrator/templates/atum/scss/template.scss +++ b/administrator/templates/atum/scss/template.scss @@ -59,6 +59,9 @@ @import "pages/com_templates"; @import "pages/com_users"; +// Mixins +@import "_mixin"; + .container-main, .system-debug { padding-bottom: 50px; @@ -114,4 +117,13 @@ // Quickicon specific .message-alert { text-align: right !important; +} + +// Fadeeffect for login page +.load-fadein{ + @include fadein_page; +} + +.load-fadeout{ + @include fadeout_page; } \ No newline at end of file diff --git a/build/media_src/plg_installer_webinstaller/scss/client.css b/build/media_src/plg_installer_webinstaller/scss/client.css new file mode 100644 index 0000000000000..ae5c65f80609d --- /dev/null +++ b/build/media_src/plg_installer_webinstaller/scss/client.css @@ -0,0 +1,114 @@ +.com-apps-container .badge { + margin: 1px; } + +.com-apps-container .badge-jcommercial { + color: #212529; + background-color: #f6c801; } + .com-apps-container .badge-jcommercial[href]:hover, .com-apps-container .badge-jcommercial[href]:focus { + color: #212529; + text-decoration: none; + background-color: #c39f01; } + +.com-apps-container .badge-jcomponent { + color: #fff; + background-color: #1e9e33; } + .com-apps-container .badge-jcomponent[href]:hover, .com-apps-container .badge-jcomponent[href]:focus { + color: #fff; + text-decoration: none; + background-color: #167325; } + +.com-apps-container .badge-jlanguage { + color: #fff; + background-color: #343a40; } + .com-apps-container .badge-jlanguage[href]:hover, .com-apps-container .badge-jlanguage[href]:focus { + color: #fff; + text-decoration: none; + background-color: #1d2124; } + +.com-apps-container .badge-jmodule { + color: #fff; + background-color: #e20a0a; } + .com-apps-container .badge-jmodule[href]:hover, .com-apps-container .badge-jmodule[href]:focus { + color: #fff; + text-decoration: none; + background-color: #b10808; } + +.com-apps-container .badge-jplugin { + color: #fff; + background-color: #57278e; } + .com-apps-container .badge-jplugin[href]:hover, .com-apps-container .badge-jplugin[href]:focus { + color: #fff; + text-decoration: none; + background-color: #3e1c66; } + +.com-apps-container .badge-jspecific { + color: #212529; + background-color: #d69b34; } + .com-apps-container .badge-jspecific[href]:hover, .com-apps-container .badge-jspecific[href]:focus { + color: #212529; + text-decoration: none; + background-color: #b37f24; } + +.com-apps-container .badge-jtool { + color: #fff; + background-color: #333; } + .com-apps-container .badge-jtool[href]:hover, .com-apps-container .badge-jtool[href]:focus { + color: #fff; + text-decoration: none; + background-color: #1a1a1a; } + +.com-apps-container .fader { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + margin-top: 5px; + text-align: center; + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 70%, white 95%); + background-repeat: repeat-x; } + +.com-apps-container .com-apps-sidebar .nav .nav { + padding-left: 15px; } + +.com-apps-container .com-apps-sidebar a:hover, .com-apps-container .com-apps-sidebar a.active { + color: #fff; + text-decoration: none; + background-color: #33608f; } + +.com-apps-container .grid-container .card { + height: 400px; + margin-bottom: 10px; } + .com-apps-container .grid-container .card:hover { + background-color: #fff; } + +.com-apps-container .grid-container .card-text { + height: 160px; + overflow: hidden; } + +.com-apps-container .grid-container .card-body { + cursor: pointer; } + +.com-apps-container .list-container { + box-sizing: border-box; } + .com-apps-container .list-container .fader { + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, white 25%); + background-repeat: repeat-x; } + .com-apps-container .list-container .list-group-item { + margin-bottom: 10px; } + .com-apps-container .list-container .list-group-item:hover { + background-color: #f8f8f8; } + .com-apps-container .list-container .list-group-item .row { + cursor: pointer; } + +.ifw-busy { + overflow: hidden; } + +.ifw-loading-container { + top: 0; + left: 0; + z-index: 1000; + width: 100%; + height: 100%; + background: url("../../system/images/ajax-loader.gif") rgba(255, 255, 255, 0.7) 50% 10px no-repeat; + opacity: .95; } diff --git a/build/media_src/plg_installer_webinstaller/scss/client.min.css b/build/media_src/plg_installer_webinstaller/scss/client.min.css new file mode 100644 index 0000000000000..435ad3f284338 --- /dev/null +++ b/build/media_src/plg_installer_webinstaller/scss/client.min.css @@ -0,0 +1 @@ +.com-apps-container .badge{margin:1px}.com-apps-container .badge-jcommercial{color:#212529;background-color:#f6c801}.com-apps-container .badge-jcommercial[href]:focus,.com-apps-container .badge-jcommercial[href]:hover{color:#212529;text-decoration:none;background-color:#c39f01}.com-apps-container .badge-jcomponent{color:#fff;background-color:#1e9e33}.com-apps-container .badge-jcomponent[href]:focus,.com-apps-container .badge-jcomponent[href]:hover{color:#fff;text-decoration:none;background-color:#167325}.com-apps-container .badge-jlanguage{color:#fff;background-color:#343a40}.com-apps-container .badge-jlanguage[href]:focus,.com-apps-container .badge-jlanguage[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.com-apps-container .badge-jmodule{color:#fff;background-color:#e20a0a}.com-apps-container .badge-jmodule[href]:focus,.com-apps-container .badge-jmodule[href]:hover{color:#fff;text-decoration:none;background-color:#b10808}.com-apps-container .badge-jplugin{color:#fff;background-color:#57278e}.com-apps-container .badge-jplugin[href]:focus,.com-apps-container .badge-jplugin[href]:hover{color:#fff;text-decoration:none;background-color:#3e1c66}.com-apps-container .badge-jspecific{color:#212529;background-color:#d69b34}.com-apps-container .badge-jspecific[href]:focus,.com-apps-container .badge-jspecific[href]:hover{color:#212529;text-decoration:none;background-color:#b37f24}.com-apps-container .badge-jtool{color:#fff;background-color:#333}.com-apps-container .badge-jtool[href]:focus,.com-apps-container .badge-jtool[href]:hover{color:#fff;text-decoration:none;background-color:#1a1a1a}.com-apps-container .fader{position:absolute;top:0;left:0;width:100%;height:100%;margin-top:5px;text-align:center;background-image:linear-gradient(180deg,hsla(0,0%,100%,0) 70%,#fff 95%);background-repeat:repeat-x}.com-apps-container .com-apps-sidebar .nav .nav{padding-left:15px}.com-apps-container .com-apps-sidebar a.active,.com-apps-container .com-apps-sidebar a:hover{color:#fff;text-decoration:none;background-color:#33608f}.com-apps-container .grid-container .card{height:400px;margin-bottom:10px}.com-apps-container .grid-container .card:hover{background-color:#fff}.com-apps-container .grid-container .card-text{height:160px;overflow:hidden}.com-apps-container .grid-container .card-body{cursor:pointer}.com-apps-container .list-container{box-sizing:border-box}.com-apps-container .list-container .fader{background-image:linear-gradient(180deg,hsla(0,0%,100%,0) 0,#fff 25%);background-repeat:repeat-x}.com-apps-container .list-container .list-group-item{margin-bottom:10px}.com-apps-container .list-container .list-group-item:hover{background-color:#f8f8f8}.com-apps-container .list-container .list-group-item .row{cursor:pointer}.ifw-busy{overflow:hidden}.ifw-loading-container{top:0;left:0;z-index:1000;width:100%;height:100%;background:url(../../system/images/ajax-loader.gif) hsla(0,0%,100%,.7) 50% 10px no-repeat;opacity:.95} \ No newline at end of file diff --git a/libraries/--autoload_psr4.php b/libraries/--autoload_psr4.php new file mode 100644 index 0000000000000..aa4b285db4234 --- /dev/null +++ b/libraries/--autoload_psr4.php @@ -0,0 +1,107 @@ + [JPATH_ROOT . "/components/com_admin/"], + 'Joomla\\Component\\Admin\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_admin/"], + 'Joomla\\Component\\Associations\\Site\\' => [JPATH_ROOT . "/components/com_associations/"], + 'Joomla\\Component\\Associations\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_associations/"], + 'Joomla\\Component\\Banners\\Site\\' => [JPATH_ROOT . "/components/com_banners/"], + 'Joomla\\Component\\Banners\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_banners/"], + 'Joomla\\Component\\Cache\\Site\\' => [JPATH_ROOT . "/components/com_cache/"], + 'Joomla\\Component\\Cache\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_cache/"], + 'Joomla\\Component\\Categories\\Site\\' => [JPATH_ROOT . "/components/com_categories/"], + 'Joomla\\Component\\Categories\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_categories/"], + 'Joomla\\Component\\Checkin\\Site\\' => [JPATH_ROOT . "/components/com_checkin/"], + 'Joomla\\Component\\Checkin\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_checkin/"], + 'Joomla\\Component\\Config\\Site\\' => [JPATH_ROOT . "/components/com_config/"], + 'Joomla\\Component\\Config\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_config/"], + 'Joomla\\Component\\Contact\\Site\\' => [JPATH_ROOT . "/components/com_contact/"], + 'Joomla\\Component\\Contact\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_contact/"], + 'Joomla\\Component\\Content\\Site\\' => [JPATH_ROOT . "/components/com_content/"], + 'Joomla\\Component\\Content\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_content/"], + 'Joomla\\Component\\Contenthistory\\Site\\' => [JPATH_ROOT . "/components/com_contenthistory/"], + 'Joomla\\Component\\Contenthistory\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_contenthistory/"], + 'Joomla\\Component\\Cpanel\\Site\\' => [JPATH_ROOT . "/components/com_cpanel/"], + 'Joomla\\Component\\Cpanel\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_cpanel/"], + 'Joomla\\Component\\Csp\\Site\\' => [JPATH_ROOT . "/components/com_csp/"], + 'Joomla\\Component\\Csp\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_csp/"], + 'Joomla\\Component\\Fields\\Site\\' => [JPATH_ROOT . "/components/com_fields/"], + 'Joomla\\Component\\Fields\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_fields/"], + 'Joomla\\Component\\Finder\\Site\\' => [JPATH_ROOT . "/components/com_finder/"], + 'Joomla\\Component\\Finder\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_finder/"], + 'Joomla\\Component\\Installer\\Site\\' => [JPATH_ROOT . "/components/com_installer/"], + 'Joomla\\Component\\Installer\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_installer/"], + 'Joomla\\Component\\Joomlaupdate\\Site\\' => [JPATH_ROOT . "/components/com_joomlaupdate/"], + 'Joomla\\Component\\Joomlaupdate\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_joomlaupdate/"], + 'Joomla\\Component\\Languages\\Site\\' => [JPATH_ROOT . "/components/com_languages/"], + 'Joomla\\Component\\Languages\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_languages/"], + 'Joomla\\Component\\Login\\Site\\' => [JPATH_ROOT . "/components/com_login/"], + 'Joomla\\Component\\Login\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_login/"], + 'Joomla\\Component\\Mailto\\Site\\' => [JPATH_ROOT . "/components/com_mailto/"], + 'Joomla\\Component\\Mailto\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_mailto/"], + 'Joomla\\Component\\Media\\Site\\' => [JPATH_ROOT . "/components/com_media/src"], + 'Joomla\\Component\\Media\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_media/src"], + 'Joomla\\Component\\Menus\\Site\\' => [JPATH_ROOT . "/components/com_menus/"], + 'Joomla\\Component\\Menus\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_menus/"], + 'Joomla\\Component\\Messages\\Site\\' => [JPATH_ROOT . "/components/com_messages/"], + 'Joomla\\Component\\Messages\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_messages/"], + 'Joomla\\Component\\Modules\\Site\\' => [JPATH_ROOT . "/components/com_modules/"], + 'Joomla\\Component\\Modules\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_modules/"], + 'Joomla\\Component\\Newsfeeds\\Site\\' => [JPATH_ROOT . "/components/com_newsfeeds/"], + 'Joomla\\Component\\Newsfeeds\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_newsfeeds/"], + 'Joomla\\Component\\Plugins\\Site\\' => [JPATH_ROOT . "/components/com_plugins/"], + 'Joomla\\Component\\Plugins\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_plugins/"], + 'Joomla\\Component\\Postinstall\\Site\\' => [JPATH_ROOT . "/components/com_postinstall/"], + 'Joomla\\Component\\Postinstall\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_postinstall/"], + 'Joomla\\Component\\Redirect\\Site\\' => [JPATH_ROOT . "/components/com_redirect/"], + 'Joomla\\Component\\Redirect\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_redirect/"], + 'Joomla\\Component\\Search\\Site\\' => [JPATH_ROOT . "/components/com_search/"], + 'Joomla\\Component\\Search\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_search/"], + 'Joomla\\Component\\Tags\\Site\\' => [JPATH_ROOT . "/components/com_tags/"], + 'Joomla\\Component\\Tags\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_tags/"], + 'Joomla\\Component\\Templates\\Site\\' => [JPATH_ROOT . "/components/com_templates/"], + 'Joomla\\Component\\Templates\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_templates/"], + 'Joomla\\Component\\Users\\Site\\' => [JPATH_ROOT . "/components/com_users/"], + 'Joomla\\Component\\Users\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_users/"], + 'Joomla\\Component\\Workflow\\Site\\' => [JPATH_ROOT . "/components/com_workflow/"], + 'Joomla\\Component\\Workflow\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_workflow/"], + 'Joomla\\Component\\Wrapper\\Site\\' => [JPATH_ROOT . "/components/com_wrapper/"], + 'Joomla\\Component\\Wrapper\\Administrator\\' => [JPATH_ROOT . "/administrator/components/com_wrapper/"], + 'Joomla\\Module\\ArticlesArchive\\Site\\' => [JPATH_ROOT . "/modules/mod_articles_archive/"], + 'Joomla\\Module\\ArticlesCategories\\Site\\' => [JPATH_ROOT . "/modules/mod_articles_categories/"], + 'Joomla\\Module\\ArticlesCategory\\Site\\' => [JPATH_ROOT . "/modules/mod_articles_category/"], + 'Joomla\\Module\\ArticlesLatest\\Site\\' => [JPATH_ROOT . "/modules/mod_articles_latest/"], + 'Joomla\\Module\\ArticlesNews\\Site\\' => [JPATH_ROOT . "/modules/mod_articles_news/"], + 'Joomla\\Module\\ArticlesPopular\\Site\\' => [JPATH_ROOT . "/modules/mod_articles_popular/"], + 'Joomla\\Module\\Banners\\Site\\' => [JPATH_ROOT . "/modules/mod_banners/"], + 'Joomla\\Module\\Breadcrumbs\\Site\\' => [JPATH_ROOT . "/modules/mod_breadcrumbs/"], + 'Joomla\\Module\\Feed\\Site\\' => [JPATH_ROOT . "/modules/mod_feed/"], + 'Joomla\\Module\\Finder\\Site\\' => [JPATH_ROOT . "/modules/mod_finder/"], + 'Joomla\\Module\\Footer\\Site\\' => [JPATH_ROOT . "/modules/mod_footer/"], + 'Joomla\\Module\\Languages\\Site\\' => [JPATH_ROOT . "/modules/mod_languages/"], + 'Joomla\\Module\\Login\\Site\\' => [JPATH_ROOT . "/modules/mod_login/"], + 'Joomla\\Module\\Menu\\Site\\' => [JPATH_ROOT . "/modules/mod_menu/"], + 'Joomla\\Module\\RandomImage\\Site\\' => [JPATH_ROOT . "/modules/mod_random_image/"], + 'Joomla\\Module\\RelatedItems\\Site\\' => [JPATH_ROOT . "/modules/mod_related_items/"], + 'Joomla\\Module\\Search\\Site\\' => [JPATH_ROOT . "/modules/mod_search/"], + 'Joomla\\Module\\Stats\\Site\\' => [JPATH_ROOT . "/modules/mod_stats/"], + 'Joomla\\Module\\Syndicate\\Site\\' => [JPATH_ROOT . "/modules/mod_syndicate/"], + 'Joomla\\Module\\TagsPopular\\Site\\' => [JPATH_ROOT . "/modules/mod_tags_popular/"], + 'Joomla\\Module\\TagsSimilar\\Site\\' => [JPATH_ROOT . "/modules/mod_tags_similar/"], + 'Joomla\\Module\\UsersLatest\\Site\\' => [JPATH_ROOT . "/modules/mod_users_latest/"], + 'Joomla\\Module\\Whosonline\\Site\\' => [JPATH_ROOT . "/modules/mod_whosonline/"], + 'Joomla\\Module\\Wrapper\\Site\\' => [JPATH_ROOT . "/modules/mod_wrapper/"], + 'Joomla\\Module\\Feed\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_feed/"], + 'Joomla\\Module\\Latest\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_latest/"], + 'Joomla\\Module\\Logged\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_logged/"], + 'Joomla\\Module\\Login\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_login/"], + 'Joomla\\Module\\Menu\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_menu/"], + 'Joomla\\Module\\Multilangstatus\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_multilangstatus/"], + 'Joomla\\Module\\Popular\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_popular/"], + 'Joomla\\Module\\Quickicon\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_quickicon/"], + 'Joomla\\Module\\Sampledata\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_sampledata/"], + 'Joomla\\Module\\StatsAdmin\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_stats_admin/"], + 'Joomla\\Module\\Version\\Administrator\\' => [JPATH_ROOT . "/administrator/modules/mod_version/"], + 'Joomla\\Plugin\\Filesystem\\Local\\' => [JPATH_ROOT . "//plugins/filesystem/local/"], + 'Joomla\\Plugin\\System\\Stats\\' => [JPATH_ROOT . "//plugins/system/stats/"], +]; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9bf5acf2851fb..d1754c613e71f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5752,13 +5752,13 @@ }, "jasmine-core": { "version": "2.99.1", - "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, "karma": { "version": "0.13.22", - "resolved": "http://registry.npmjs.org/karma/-/karma-0.13.22.tgz", + "resolved": "https://registry.npmjs.org/karma/-/karma-0.13.22.tgz", "integrity": "sha1-B3ULG9Bj1+fnuRvNLmNU2PKqh0Q=", "dev": true, "requires": { @@ -5795,7 +5795,7 @@ }, "karma-jasmine": { "version": "0.3.8", - "resolved": "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.3.8.tgz", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.3.8.tgz", "integrity": "sha1-W2RXeRrZuJqhc/B54+vhuMgFI2w=", "dev": true }, @@ -6136,7 +6136,7 @@ }, "engine.io-client": { "version": "3.2.1", - "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", "dev": true, "requires": { @@ -6463,7 +6463,7 @@ }, "lru-cache": { "version": "2.2.4", - "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", "dev": true }, @@ -6566,7 +6566,7 @@ }, "socket.io-parser": { "version": "3.2.0", - "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", "dev": true, "requires": { diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index c116d0595bd35..727bb0d77831a 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -6,7 +6,7 @@ Joomla: Environment Setup Incomplete - +
    diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 55bd7a21c496f..3422c6245ffeb 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -6,7 +6,7 @@ Joomla: unsupported PHP version - +
    From 7e52da8d97a81b1da79dbacda40f3505fd18da01 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Sat, 19 Jan 2019 14:49:56 +0100 Subject: [PATCH 0011/1831] removed underscore for import --- administrator/templates/atum/scss/template.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss index d1e29b3826901..c59db34d97d63 100644 --- a/administrator/templates/atum/scss/template.scss +++ b/administrator/templates/atum/scss/template.scss @@ -60,7 +60,7 @@ @import "pages/com_users"; // Mixins -@import "_mixin"; +@import "mixin"; .container-main, .system-debug { From 1aec92b73f2af201007e1e2073b078c375315958 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Mon, 21 Jan 2019 14:39:03 +0100 Subject: [PATCH 0012/1831] add css-variables for customization in Backend --background-color-light:#ebf0f5; --background-color-dark:#1a466b; --font-color-light:$white; --font-color-dark:$blue; --link-color:$gray-600; --- administrator/templates/atum/scss/_variables.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 99f351a691984..89161c9fbbf02 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -1,5 +1,7 @@ @import "../../../../media/vendor/bootstrap/scss/functions"; + + $white: #fff; $gray-100: #f8f9fa; $gray-200: #e9ecef; @@ -23,6 +25,15 @@ $green: #2f7d32; $teal: #20c997; $cyan: #108193; +//variables for colors +:root{ +--background-color-light:#ebf0f5; +--background-color-dark:#1a466b; +--font-color-light:$white; +--font-color-dark:$blue; +--link-color:$gray-600; +} + $theme-colors: (); $theme-colors: map-merge(( primary: $blue, From 256824da0e09c84d82687368bc53368e3aacdbb0 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Mon, 21 Jan 2019 16:06:28 +0100 Subject: [PATCH 0013/1831] Changed login page --- .../atum/images/logo-joomla-blue.svg | 45 +++++++++++ administrator/templates/atum/login.php | 80 +++++++++---------- 2 files changed, 85 insertions(+), 40 deletions(-) create mode 100644 administrator/templates/atum/images/logo-joomla-blue.svg diff --git a/administrator/templates/atum/images/logo-joomla-blue.svg b/administrator/templates/atum/images/logo-joomla-blue.svg new file mode 100644 index 0000000000000..3fe7ae5af774d --- /dev/null +++ b/administrator/templates/atum/images/logo-joomla-blue.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index a93c19ffc65b5..6f6381bfb2e29 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; /** @var JDocumentHtml $this */ @@ -41,6 +42,8 @@ $task = $app->input->getCmd('task', ''); $itemid = $app->input->getCmd('Itemid', ''); $sitename = $app->get('sitename'); +$logoBlue = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; +$logo = $logoBlue; // Template params $showSitename = $this->params->get('showSitename', '1'); @@ -64,46 +67,43 @@ - -
    - - -
    + + +
    + + + + +
    +
    +
    + +
    +
    +
    +
    From 81b4f2036651bca24992b62eb6041ae6905af512 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Mon, 21 Jan 2019 22:04:58 +0100 Subject: [PATCH 0014/1831] first css changes for login --- administrator/templates/atum/scss/_variables.scss | 4 ++-- .../templates/atum/scss/blocks/_login.scss | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 89161c9fbbf02..212622d2d8f9c 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -29,8 +29,8 @@ $cyan: #108193; :root{ --background-color-light:#ebf0f5; --background-color-dark:#1a466b; ---font-color-light:$white; ---font-color-dark:$blue; +--font-color-light:#fff; +--font-color-dark:var--(gray-600); --link-color:$gray-600; } diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss index 20d0ea1d56f67..9fc06fc180c41 100644 --- a/administrator/templates/atum/scss/blocks/_login.scss +++ b/administrator/templates/atum/scss/blocks/_login.scss @@ -35,6 +35,9 @@ .login { width: 410px; + background:var(--white); + padding:15px; + color:var(--font-color-dark); @include media-breakpoint-down(sm) { padding: 0 15px; @@ -81,3 +84,13 @@ max-width: none; } } + + +.com_login .sidebar-wrapper .main-brand{ + margin-top:20px; + color:var(--font-color-light); +} +.com_login .sidebar-wrapper .main-brand h1, +.com_login .sidebar-wrapper .main-brand a{ + color:var(--font-color-light); +} From 72954c6efa9e4190bef1670fcc8edcc243957e8a Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 22 Jan 2019 20:06:24 +0100 Subject: [PATCH 0015/1831] Ajaxifying the login process --- .../Controller/DisplayController.php | 43 +++++++++++++++---- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/administrator/components/com_login/Controller/DisplayController.php b/administrator/components/com_login/Controller/DisplayController.php index 58a9756b79d53..470293f31e806 100644 --- a/administrator/components/com_login/Controller/DisplayController.php +++ b/administrator/components/com_login/Controller/DisplayController.php @@ -13,6 +13,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; +use Joomla\CMS\Response\JsonResponse; use Joomla\CMS\Session\Session; use Joomla\CMS\Uri\Uri; @@ -79,24 +80,48 @@ public function login() $result = $app->login($credentials, array('action' => 'core.login.admin')); - if ($result && !($result instanceof \Exception)) + if ($app->input->getCmd('format') == 'json') { - // Only redirect to an internal URL. - if (Uri::isInternal($return)) + if ($result && !($result instanceof \Exception)) { - // If &tmpl=component - redirect to index.php - if (strpos($return, 'tmpl=component') === false) + // Only redirect to an internal URL. + if (!Uri::isInternal($return) || strpos($return, 'tmpl=component') !== false) { - $app->redirect($return); + $return = 'index.php'; } - else + + $response = new JsonResponse((object) ['return' => $return]); + } + else + { + $message = null; + + if ($result instanceof \Exception) { - $app->redirect('index.php'); + $message = $result->getMessage(); } + $response = new JsonResponse(null, $message, true); } + + echo $response; + + return; } + else + { + if ($result && !($result instanceof \Exception)) + { + // Only redirect to an internal URL. + if (Uri::isInternal($return) && strpos($return, 'tmpl=component') === false) + { + $app->redirect($return); + } + + $app->redirect('index.php'); + } - $this->display(); + $this->display(); + } } /** From 7bd8d442869b88934f6f0b2ef194d5596842efe4 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Tue, 22 Jan 2019 23:53:56 +0100 Subject: [PATCH 0016/1831] Adding ajaxified JS Login --- .../language/en-GB/en-GB.mod_login.ini | 4 +- .../modules/mod_login/tmpl/default.php | 23 +++++------ .../atum/language/en-GB/en-GB.tpl_atum.ini | 2 +- administrator/templates/atum/login.php | 8 ++-- .../media_src/mod_login/js/admin-login.es6.js | 40 ++++++++++++++++++- 5 files changed, 54 insertions(+), 23 deletions(-) diff --git a/administrator/language/en-GB/en-GB.mod_login.ini b/administrator/language/en-GB/en-GB.mod_login.ini index 365ea688e1515..5c129b326344e 100644 --- a/administrator/language/en-GB/en-GB.mod_login.ini +++ b/administrator/language/en-GB/en-GB.mod_login.ini @@ -7,5 +7,5 @@ MOD_LOGIN="Login Form" MOD_LOGIN_LANGUAGE="Language" MOD_LOGIN_LOGIN_TITLE="Administrator Log In" MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It should not be unpublished." -MOD_LOGIN_REMIND="Forgot your username?" -MOD_LOGIN_RESET="Forgot your password?" +MOD_LOGIN_REMIND="Forgot your credentials?" +MOD_LOGIN_REMIND_LINK="https://docs.joomla.org/How_do_you_recover_or_reset_your_admin_password%3F" diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php index 77d34759021ea..9163f77ad7cc3 100644 --- a/administrator/modules/mod_login/tmpl/default.php +++ b/administrator/modules/mod_login/tmpl/default.php @@ -27,7 +27,7 @@ +
    +
    + + + +
    +
    diff --git a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini index 0bd5d7b248bd8..196f3c1a77a13 100644 --- a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini +++ b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini @@ -17,4 +17,4 @@ TPL_BACK_TO_CONTROL_PANEL="Back to Control Panel" TPL_ATUM_TOOLBAR="Toolbar" TPL_ATUM_VIEW_SITE="View Site" TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the Joomla 4 administrator template based on Bootstrap 4." - +TPL_ATUM_LOGIN_SIDEBAR_SITENAME_LINK="view %s" diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index 6f6381bfb2e29..1377ccecf8cb0 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -42,8 +42,8 @@ $task = $app->input->getCmd('task', ''); $itemid = $app->input->getCmd('Itemid', ''); $sitename = $app->get('sitename'); -$logoBlue = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; -$logo = $logoBlue; +$logoBlue = $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg'; +$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; // Template params $showSitename = $this->params->get('showSitename', '1'); @@ -83,9 +83,9 @@
    • '; // WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call - $menu->renderSubmenu(ModuleHelper::getLayoutPath('mod_menu', 'default_submenu')); + $menu->renderSubmenu(ModuleHelper::getLayoutPath('mod_menu', 'default_submenu'), $root); echo "\n"; - - if ($css = $menuTree->getCss()) - { - $doc->addStyleDeclaration(implode("\n", $css)); - } } diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php index e9496e370cdf6..0b00984d64efa 100644 --- a/administrator/modules/mod_menu/tmpl/default_submenu.php +++ b/administrator/modules/mod_menu/tmpl/default_submenu.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; -use Joomla\CMS\Menu\Node\Separator; /** * ========================================================================================================= @@ -19,7 +18,6 @@ * ========================================================================================================= */ /** @var \Joomla\Module\Menu\Administrator\Menu\CssMenu $this */ -$current = $this->tree->getCurrent(); $class = ''; // Build the CSS class suffix @@ -27,15 +25,15 @@ { $class = ' class="disabled"'; } -elseif ($current instanceOf Separator) +elseif ($current->type == 'separator') { - $class = $current->get('title') ? ' class="menuitem-group"' : ' class="divider"'; + $class = $current->title ? ' class="menuitem-group"' : ' class="divider"'; } elseif ($current->hasChildren()) { $class = ' class="dropdown-submenu"'; - if ($current->getLevel() == 1) + if ($current->level == 1) { $class = ' class="parent"'; } @@ -46,7 +44,7 @@ } // Set the correct aria role and print the item -if ($current instanceOf Separator) +if ($current->type == 'separator') { echo ''; } @@ -64,7 +62,7 @@ { $linkClass[] = 'has-arrow'; - if ($current->getLevel() > 2) + if ($current->level > 2) { $dataToggle = ' data-toggle="dropdown"'; } @@ -81,22 +79,22 @@ $link = $current->get('link'); // Get the menu icon -$icon = $this->tree->getIconClass(); -$iconClass = ($icon != '' && $current->getLevel() == 1) ? '' : ''; +$icon = $this->getIconClass($current); +$iconClass = ($icon != '' && $current->level == 1) ? '' : ''; -if ($link !== null && $current->get('target') !== null && $current->get('target') !== '') +if ($link != '' && $current->target != '') { - echo "get('target') . "\">" + echo "target . "\">" . $iconClass - . '' . Text::_($current->get('title')) . ""; + . '' . Text::_($current->title) . ""; } -elseif ($link !== null) +elseif ($link != '') { echo "" . $iconClass . '' . Text::_($current->get('title')) . ""; } -elseif ($current->get('title') !== null && $current->get('class') !== 'separator') +elseif ($current->title != '' && $current->get('class') !== 'separator') { echo "" . $iconClass @@ -110,19 +108,19 @@ // Recurse through children if they exist if ($this->enabled && $current->hasChildren()) { - if ($current->getLevel() > 1) + if ($current->level > 1) { $id = $current->get('id') ? ' id="menu-' . strtolower($current->get('id')) . '"' : ''; - echo '' . "\n"; + echo '' . "\n"; } else { - echo ' From ff8e1075925d84e4391c9462e0a21de86cf0a26f Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 9 Feb 2019 17:54:54 +0100 Subject: [PATCH 0079/1831] Fixing docblocks --- administrator/modules/mod_menu/Menu/CssMenu.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/administrator/modules/mod_menu/Menu/CssMenu.php b/administrator/modules/mod_menu/Menu/CssMenu.php index 0de9de82bde1d..7225d4b44e2e5 100644 --- a/administrator/modules/mod_menu/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/Menu/CssMenu.php @@ -73,7 +73,15 @@ class CssMenu */ protected $application; + /** + * A counter for unique IDs + * + * @var int + * + * @since __DEPLOY_VERSION__ + */ protected $counter = 0; + /** * CssMenu constructor. * @@ -93,7 +101,7 @@ public function __construct(CMSApplication $application) * @param Registry $params Menu configuration parameters * @param bool $enabled Whether the menu should be enabled or disabled * - * @return void + * @return MenuItem Root node of the menu tree * * @since 3.7.0 */ @@ -516,7 +524,7 @@ public function getIconClass($node) * * @return string * - * @since 4.0.0 + * @since __DEPLOY_VERSION__ */ public function getCounter() { From f5005a8038dad111de3ca1d6e5a37556bfe59d9f Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 9 Feb 2019 18:37:56 +0100 Subject: [PATCH 0080/1831] Improving comment for onPreprocessMenuItems --- administrator/modules/mod_menu/Menu/CssMenu.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/administrator/modules/mod_menu/Menu/CssMenu.php b/administrator/modules/mod_menu/Menu/CssMenu.php index 7225d4b44e2e5..fdd9158bfa777 100644 --- a/administrator/modules/mod_menu/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/Menu/CssMenu.php @@ -267,8 +267,11 @@ protected function preprocess($parent) $noSeparator = true; $children = $parent->getChildren(); - // Call preprocess for the menu items on plugins. - // Plugins should normally process the current level only unless their logic needs deep levels too. + /** + * Trigger onPreprocessMenuItems for the current level of backend menu items. + * $children is an array of MenuItem objects. A plugin can traverse the whole tree, + * but new nodes will only be run through this method if their parents have not been processed yet. + */ $this->application->triggerEvent('onPreprocessMenuItems', array('com_menus.administrator.module', $children, $this->params, $this->enabled)); From 9cee196ba82f986179e988774e1d57329e4f6717 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 9 Feb 2019 19:12:34 +0100 Subject: [PATCH 0081/1831] Some styling --- administrator/templates/atum/scss/blocks/_sidebar.scss | 5 ++--- templates/system/incompatible.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 5bdb6e610c3e8..4bf1f3bfbe402 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -119,10 +119,9 @@ } &.menu-quicktask { - width: 1rem; - height: 1rem; - flex-basis: 1rem; + flex-basis: 2.5rem; padding: 4px 5px; + text-align: center; &::before { background-image: none; diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 55bd7a21c496f..3422c6245ffeb 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -6,7 +6,7 @@ Joomla: unsupported PHP version - +
    From 6512ca0cb52a20dc1795714ab543d45f3314694b Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Sat, 9 Feb 2019 20:21:34 +0100 Subject: [PATCH 0082/1831] Prepare 3.9.3 release candidate --- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 2 +- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 2 +- installation/language/en-GB/en-GB.xml | 2 +- language/en-GB/en-GB.xml | 2 +- language/en-GB/install.xml | 2 +- libraries/src/Version.php | 10 +++++----- plugins/actionlog/joomla/joomla.php | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index a2c7d1c855eac..711a42aef0844 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.9.3 - January 2019 + February 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 34d118932642f..e8e92b8c462f9 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 3.9.3 - January 2019 + February 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index dae073506e27f..ac1e382f97af2 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2005 - 2019 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.9.3-dev - January 2019 + 3.9.3-rc + February 2019 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index be5228af545de..bbc54a635317f 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 3.9.3.1 - January 2019 + February 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index c141d4028270a..493c748bbd8b8 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -4,7 +4,7 @@ client="installation"> English (United Kingdom) 3.9.3 - January 2019 + February 2019 Joomla! Project Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index d1d17e22cfcf5..f9ee5796617fc 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) 3.9.3 - January 2019 + February 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 94ed2b557c93a..009fef064879b 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 3.9.3 - January 2019 + February 2019 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 798f29938b977..1f1116666f526 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'dev'; + const EXTRA_VERSION = 'rc'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '3-dev'; + const DEV_LEVEL = '3-rc'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Release Candidate'; /** * Build number. @@ -111,7 +111,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '15-January-2019'; + const RELDATE = '9-February-2019'; /** * Release time. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '15:00'; + const RELTIME = '19:20'; /** * Release timezone. diff --git a/plugins/actionlog/joomla/joomla.php b/plugins/actionlog/joomla/joomla.php index be959b670f23b..2906ce1465cd4 100644 --- a/plugins/actionlog/joomla/joomla.php +++ b/plugins/actionlog/joomla/joomla.php @@ -919,7 +919,7 @@ public function onUserAfterRemind($user) * * @return void * - * @since __DEPLOY_VERSION__ + * @since 3.9.3 */ public function onAfterCheckin($table) { From 6bd634ae00a768e4969fee05cfee4e56d5419e87 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Sat, 9 Feb 2019 20:31:56 +0100 Subject: [PATCH 0083/1831] Reset for dev --- administrator/manifests/files/joomla.xml | 2 +- libraries/src/Version.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index ac1e382f97af2..a107b5303d8ed 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2019 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.9.3-rc + 3.9.3-dev February 2019 FILES_JOOMLA_XML_DESCRIPTION diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 1f1116666f526..fb6c65d53d41f 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'rc'; + const EXTRA_VERSION = 'dev'; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '3-rc'; + const DEV_LEVEL = '3-dev'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Release Candidate'; + const DEV_STATUS = 'Development'; /** * Build number. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '19:20'; + const RELTIME = '19:31'; /** * Release timezone. From ac5ed798ed791fa0b7460d72bdfdd32f57600b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lavinia=20Popa-R=C3=B6ssel?= Date: Sat, 9 Feb 2019 23:15:49 +0100 Subject: [PATCH 0084/1831] removed absolute position in sidebar and added flexbox, so site get scrollable --- administrator/templates/atum/scss/blocks/_login.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss index e09e30360e052..2ef6c94bc77d0 100644 --- a/administrator/templates/atum/scss/blocks/_login.scss +++ b/administrator/templates/atum/scss/blocks/_login.scss @@ -56,6 +56,8 @@ padding:15px; color:var(--atum-text-dark); border-radius:3px; + margin-top: 10rem; + align-self: flex-start; -webkit-box-shadow: 0px 0px 10px 0px #ccc; -moz-box-shadow: 0px 0px 10px 0px #ccc; box-shadow: 0px 0px 10px 0px #ccc; @@ -147,10 +149,10 @@ #sidebar { color: var(--atum-text-light); - position:absolute; - bottom: 40px; width: 100%; text-align: center; + align-self: flex-end; + .card { .module-body { padding: .75rem 1.25rem; @@ -182,6 +184,8 @@ margin-top:100px; color:var(--atum-text-light); text-align:center; + flex: 1; + flex-basis: auto; @include media-breakpoint-down(sm) { margin-top:10px; } From 8b0b6456d827de90c369b921f4578ba76495b8e5 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sat, 9 Feb 2019 23:57:30 +0100 Subject: [PATCH 0085/1831] Fixing issues with custom backend menus --- .../com_menus/Controller/MenuController.php | 2 +- .../com_menus/Field/MenuPresetField.php | 4 +- .../com_menus/Helper/MenusHelper.php | 44 +++++++++++-------- .../components/com_menus/presets/joomla.xml | 20 ++++----- .../modules/mod_menu/Menu/CssMenu.php | 10 ++--- 5 files changed, 44 insertions(+), 36 deletions(-) diff --git a/administrator/components/com_menus/Controller/MenuController.php b/administrator/components/com_menus/Controller/MenuController.php index 2c45deaba555f..017d690adfed5 100644 --- a/administrator/components/com_menus/Controller/MenuController.php +++ b/administrator/components/com_menus/Controller/MenuController.php @@ -76,7 +76,7 @@ public function save($key = null, $urlVar = null) // Get the model and attempt to validate the posted data. /* @var \Joomla\Component\Menus\Administrator\Model\MenuModel $model */ - $model = $this->getModel('Menu'); + $model = $this->getModel('Menu', '', ['ignore_request' => false]); $form = $model->getForm(); if (!$form) diff --git a/administrator/components/com_menus/Field/MenuPresetField.php b/administrator/components/com_menus/Field/MenuPresetField.php index 22310a786d6a0..66eeaa548589d 100644 --- a/administrator/components/com_menus/Field/MenuPresetField.php +++ b/administrator/components/com_menus/Field/MenuPresetField.php @@ -14,7 +14,7 @@ use Joomla\CMS\Form\Field\ListField; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Menu\MenuHelper; +use Joomla\Component\Menus\Administrator\Helper\MenusHelper; /** * Administrator Menu Presets list field. @@ -42,7 +42,7 @@ class MenuPresetField extends ListField protected function getOptions() { $options = array(); - $presets = MenuHelper::getPresets(); + $presets = MenusHelper::getPresets(); foreach ($presets as $preset) { diff --git a/administrator/components/com_menus/Helper/MenusHelper.php b/administrator/components/com_menus/Helper/MenusHelper.php index 340fedf45bc13..daf3457ca0c22 100644 --- a/administrator/components/com_menus/Helper/MenusHelper.php +++ b/administrator/components/com_menus/Helper/MenusHelper.php @@ -402,37 +402,37 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude = * * @throws \Exception * - * @since 3.8.0 + * @since __DEPLOY_VERSION__ */ public static function installPreset($preset, $menutype) { - $items = MenuHelper::loadPreset($preset, false); + $root = static::loadPreset($preset, false); - if (count($items) == 0) + if (count($root->getChildren()) == 0) { throw new \Exception(Text::_('COM_MENUS_PRESET_LOAD_FAILED')); } - static::installPresetItems($items, $menutype, 1); + static::installPresetItems($root, $menutype, 1); } /** * Method to install a preset menu item into database and link it to the given menutype * - * @param \stdClass[] $items The single menuitem instance with a list of its descendants - * @param string $menutype The target menutype - * @param int $parent The parent id or object + * @param MenuItem $node The parent node of the items to process + * @param string $menutype The target menutype * * @return void * * @throws \Exception * - * @since 3.8.0 + * @since __DEPLOY_VERSION__ */ - protected static function installPresetItems(&$items, $menutype, $parent = 1) + protected static function installPresetItems($node, $menutype) { $db = Factory::getDbo(); $query = $db->getQuery(true); + $items = $node->getChildren(); static $components = array(); @@ -445,7 +445,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1) Factory::getApplication()->triggerEvent('onPreprocessMenuItems', array('com_menus.administrator.import', &$items, null, true)); - foreach ($items as &$item) + foreach ($items as $item) { /** @var \JTableMenu $table */ $table = Table::getInstance('Menu'); @@ -465,7 +465,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1) 'menutype' => $menutype, 'type' => $item->type, 'title' => $item->title, - 'parent_id' => $parent, + 'parent_id' => $item->getParent()->id, 'client_id' => 1, ); $table->load($keys); @@ -491,7 +491,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1) 'menutype' => $menutype, 'type' => $item->type, 'link' => $item->link, - 'parent_id' => $parent, + 'parent_id' => $item->getParent()->id, 'client_id' => 1, ); $table->load($keys); @@ -524,7 +524,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1) 'img' => $item->class, 'access' => $item->access, 'component_id' => array_search($item->element, $components) ?: 0, - 'parent_id' => $parent, + 'parent_id' => $item->getParent()->id, 'client_id' => 1, 'published' => 1, 'language' => '*', @@ -537,7 +537,7 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1) throw new \Exception('Bind failed: ' . $table->getError()); } - $table->setLocation($parent, 'last-child'); + $table->setLocation($item->getParent()->id, 'last-child'); if (!$table->check()) { @@ -551,9 +551,9 @@ protected static function installPresetItems(&$items, $menutype, $parent = 1) $item->id = $table->get('id'); - if (!empty($item->submenu)) + if ($item->hasChildren()) { - static::installPresetItems($item->submenu, $menutype, $item->id); + static::installPresetItems($item, $menutype); } } } @@ -864,9 +864,9 @@ protected static function parseXmlNode($node, $replace = array()) $item->icon = (string) $node['icon']; $item->browserNav = (string) $node['target']; $item->access = (int) $node['access']; - $item->setParams(new Registry(trim($node->params))); $item->scope = (string) $node['scope'] ?: 'default'; - $item->submenu = array(); + $item->setParams(new Registry(trim($node->params))); + $item->getParams()->set('menu-permission', (string) $node['permission']); if ($item->type == 'separator' && trim($item->title, '- ')) { @@ -878,6 +878,14 @@ protected static function parseXmlNode($node, $replace = array()) $item->link = '#'; } + if ((string) $node['quicktask']) + { + $item->getParams()->set('menu-quicktask', (string) $node['quicktask']); + $item->getParams()->set('menu-quicktask-title', (string) $node['quicktask-title']); + $item->getParams()->set('menu-quicktask-icon', (string) $node['quicktask-icon']); + $item->getParams()->set('menu-quicktask-permission', (string) $node['quicktask-permission']); + } + // Translate attributes for iterator values foreach ($replace as $var => $val) { diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml index f261a5915f29a..d866d767c5d44 100644 --- a/administrator/components/com_menus/presets/joomla.xml +++ b/administrator/components/com_menus/presets/joomla.xml @@ -20,13 +20,18 @@ title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER" type="component" element="com_content" - link="index.php?option=com_content"> + link="index.php?option=com_content" + quicktask="index.php?option=com_content&task=article.add" + quicktask-title="MOD_MENU_COM_CONTENT_ARTICLE_ADD" + > + link="index.php?option=com_categories&extension=com_content" + quicktask="index.php?option=com_categories&extension=com_content&task=category.add" + > - + link="index.php?option=com_menus&view=items&menutype={sql:menutype}" + icon="{sql:icon}" + class="class:menu"> diff --git a/administrator/modules/mod_menu/Menu/CssMenu.php b/administrator/modules/mod_menu/Menu/CssMenu.php index fdd9158bfa777..327504dfb0244 100644 --- a/administrator/modules/mod_menu/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/Menu/CssMenu.php @@ -130,11 +130,10 @@ public function load($params, $enabled) // In recovery mode, load the preset inside a special root node. $this->root = new MenuItem(['level' => 0]); $heading = new MenuItem(['title' => 'MOD_MENU_RECOVERY_MENU_ROOT', 'type' => 'heading']); - $heading->level = $this->root->level + 1; - - $heading = MenusHelper::loadPreset('joomla', true, $heading); $this->root->addChild($heading); + MenusHelper::loadPreset('joomla', true, $heading); + $this->preprocess($this->root); $this->root->addChild(new MenuItem(['type' => 'separator'])); @@ -183,14 +182,14 @@ public function renderSubmenu($layoutFile, $node) /** * Check the flat list of menu items for important links * - * @param array $items The menu items array + * @param MenuItem $node The menu items array * @param Registry $params Module options * * @return boolean Whether to show recovery menu * * @since 3.8.0 */ - protected function check($items, Registry $params) + protected function check($node, Registry $params) { $me = $this->application->getIdentity(); $authMenus = $me->authorise('core.manage', 'com_menus'); @@ -201,6 +200,7 @@ protected function check($items, Registry $params) return false; } + $items = $node->getChildren(true); $types = ArrayHelper::getColumn($items, 'type'); $elements = ArrayHelper::getColumn($items, 'element'); $rMenu = $authMenus && !in_array('com_menus', $elements); From 4adb65642e8704c5f40fffc4f5bb78f1ce6921b9 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Sun, 10 Feb 2019 14:23:52 +0100 Subject: [PATCH 0086/1831] [com_actionlog] username vs name on checkin (#23852) --- plugins/actionlog/joomla/joomla.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/actionlog/joomla/joomla.php b/plugins/actionlog/joomla/joomla.php index 2906ce1465cd4..8ccd7c256c616 100644 --- a/plugins/actionlog/joomla/joomla.php +++ b/plugins/actionlog/joomla/joomla.php @@ -935,10 +935,10 @@ public function onAfterCheckin($table) 'action' => 'checkin', 'type' => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER', 'id' => $user->id, - 'title' => $user->name, + 'title' => $user->username, 'itemlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id, 'userid' => $user->id, - 'username' => $user->name, + 'username' => $user->username, 'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id, 'table' => $table, ); From cf51ece371304b7a7993b3c61f5c0a7ba296c513 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sun, 10 Feb 2019 19:42:18 +0100 Subject: [PATCH 0087/1831] Fixing notice --- libraries/src/Router/SiteRouter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php index b065abd5d04ca..511e95d03a524 100644 --- a/libraries/src/Router/SiteRouter.php +++ b/libraries/src/Router/SiteRouter.php @@ -254,7 +254,7 @@ public function parseSefRoute(&$router, &$uri) } // Menu links are not valid URLs. Find the first parent that isn't a menulink - if ($found->type == 'menulink') + if ($found && $found->type == 'menulink') { while ($found->hasParent() && $found->type == 'menulink') { From b0ad7167e0e387cd9d32ede2480975a82baa09cf Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sun, 10 Feb 2019 22:13:55 +0100 Subject: [PATCH 0088/1831] Fixing typo --- libraries/src/Tree/NodeTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Tree/NodeTrait.php b/libraries/src/Tree/NodeTrait.php index a451a61b141f2..3dca9506f1fb7 100644 --- a/libraries/src/Tree/NodeTrait.php +++ b/libraries/src/Tree/NodeTrait.php @@ -49,7 +49,7 @@ public function setParent(NodeInterface $parent) { end($this->_parent->_children); $this->_leftSibling = prev($this->_parent->_children); - $this->_leftSibling->_rightsibling = $this; + $this->_leftSibling->_rightSibling = $this; } } From 62818f2a4143d1d78e4fb760a17b7a8f519bc521 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sun, 10 Feb 2019 22:17:18 +0100 Subject: [PATCH 0089/1831] Adding a proposal for dashboards --- .../com_cpanel/View/Cpanel/HtmlView.php | 76 ++++++++++++++++++- .../com_cpanel/tmpl/cpanel/default.php | 20 +++++ .../com_menus/Helper/MenusHelper.php | 1 + .../components/com_menus/presets/joomla.xml | 1 + 4 files changed, 97 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php index 9b2770fdba95a..b8639c12a3505 100644 --- a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php +++ b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php @@ -11,10 +11,14 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ModuleHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Menu\MenuItem; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; +use Joomla\Component\Menus\Administrator\Helper\MenusHelper; +use Joomla\Registry\Registry; /** * HTML View class for the Cpanel component @@ -30,6 +34,10 @@ class HtmlView extends BaseHtmlView */ protected $modules = null; + protected $cpanel; + + protected $menuitem; + /** * Execute and display a template script. * @@ -43,9 +51,75 @@ public function display($tpl = null) ToolbarHelper::title(Text::_('COM_CPANEL'), 'home-2 cpanel'); ToolbarHelper::help('screen.cpanel'); + $app = Factory::getApplication(); + $this->cpanel = $app->input->getCmd('cpanel'); + $position = 'cpanel'; + + if ($this->cpanel) + { + $position .= '-' . $this->cpanel; + $modules = ModuleHelper::getModules('menu'); + $module = false; + + foreach ($modules as $m) + { + if ($m->module == 'mod_menu') + { + $module = $m; + break; + } + } + + if (!$module) + { + throw new \JViewGenericdataexception('NO_BACKEBD_MENU', 500); + } + + $params = new Registry($module->params); + $menutype = $params->get('menutype', '*'); + + if ($menutype === '*') + { + $name = $params->get('preset', 'joomla'); + $root = MenusHelper::loadPreset($name); + } + else + { + $root = MenusHelper::getMenuItems($menutype, true); + } + + $this->menuitem = $this->findMenuItem($root, $this->cpanel); + } + // Display the cpanel modules - $this->modules = ModuleHelper::getModules('cpanel'); + $this->modules = ModuleHelper::getModules($position); parent::display($tpl); } + + protected function findMenuItem(MenuItem $node, $alias) + { + $items = $node->getChildren(); + + // Iterate through the whole level first before traversing deeper + foreach ($items as $item) + { + if ($item->alias == $alias) + { + return $item; + } + } + + foreach ($items as $item) + { + $result = $this->findMenuItem($item, $alias); + + if ($result) + { + return $result; + } + } + + return false; + } } diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php index e68533e3640a0..00947c9d377b9 100644 --- a/administrator/components/com_cpanel/tmpl/cpanel/default.php +++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php @@ -30,6 +30,26 @@
    + cpanel && $this->menuitem->hasChildren()) : ?> + menuitem->getChildren() as $item) : ?> + hasChildren()) : ?> +

    title; ?>

    +
      + getChildren() as $child) : ?> +
    • title; ?> + hasChildren()) : ?> +
        + getChildren() as $subchild) : ?> +
      • title; ?>
        • + +
      + +
      • + +
    + + + modules as $module) diff --git a/administrator/components/com_menus/Helper/MenusHelper.php b/administrator/components/com_menus/Helper/MenusHelper.php index daf3457ca0c22..ce9cf02795c72 100644 --- a/administrator/components/com_menus/Helper/MenusHelper.php +++ b/administrator/components/com_menus/Helper/MenusHelper.php @@ -858,6 +858,7 @@ protected static function parseXmlNode($node, $replace = array()) $item->id = null; $item->type = (string) $node['type']; $item->title = (string) $node['title']; + $item->alias = (string) $node['alias']; $item->link = (string) $node['link']; $item->element = (string) $node['element']; $item->class = (string) $node['class']; diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml index d866d767c5d44..6ff7155ee8ba8 100644 --- a/administrator/components/com_menus/presets/joomla.xml +++ b/administrator/components/com_menus/presets/joomla.xml @@ -161,6 +161,7 @@ title="MOD_MENU_COM_USERS_USERS" type="heading" class="class:users" + alias="users" > Date: Mon, 11 Feb 2019 17:11:39 +0200 Subject: [PATCH 0090/1831] [com_actionlogs] Fix plugin links (#23857) --- plugins/actionlog/joomla/joomla.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/actionlog/joomla/joomla.php b/plugins/actionlog/joomla/joomla.php index 8ccd7c256c616..2b7d72fcd4f79 100644 --- a/plugins/actionlog/joomla/joomla.php +++ b/plugins/actionlog/joomla/joomla.php @@ -118,7 +118,7 @@ public function onContentAfterSave($context, $article, $isNew) 'type' => $params->text_prefix . '_TYPE_' . $params->type_title, 'id' => $id, 'title' => $article->get($params->title_holder), - 'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id) + 'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $id, $params->id_holder) ); $this->addLog(array($message), $messageLanguageKey, $context); @@ -267,7 +267,7 @@ public function onContentChangeState($context, $pks, $value) 'type' => $params->text_prefix . '_TYPE_' . $params->type_title, 'id' => $pk, 'title' => $items[$pk]->{$params->title_holder}, - 'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk) + 'itemlink' => ActionlogsHelper::getContentTypeLink($option, $contentType, $pk, $params->id_holder) ); $messages[] = $message; From 4889f00d3770048371c83a02d8ff81ae5c85a61e Mon Sep 17 00:00:00 2001 From: Luca Marzo Date: Mon, 11 Feb 2019 18:30:29 +0100 Subject: [PATCH 0091/1831] Resolve GPL compliance issue on FOF third-party library (#23873) Apologies to @nikosdion for the oversight --- libraries/fof/database/query.php | 1 + libraries/fof/dispatcher/dispatcher.php | 19 ++++++++++--------- libraries/fof/encrypt/aes.php | 1 + libraries/fof/form/field/actions.php | 1 + libraries/fof/form/field/calendar.php | 1 + libraries/fof/form/field/components.php | 1 + libraries/fof/form/field/imagelist.php | 1 + libraries/fof/form/field/list.php | 1 + libraries/fof/form/field/media.php | 1 + libraries/fof/form/field/published.php | 1 + libraries/fof/form/header.php | 1 + libraries/fof/form/header/fielddate.php | 1 + libraries/fof/include.php | 1 + .../fof/utils/installscript/installscript.php | 1 + libraries/fof/view/view.php | 1 + 15 files changed, 24 insertions(+), 9 deletions(-) diff --git a/libraries/fof/database/query.php b/libraries/fof/database/query.php index cb610f0847697..d8760920d021b 100644 --- a/libraries/fof/database/query.php +++ b/libraries/fof/database/query.php @@ -4,6 +4,7 @@ * @subpackage database * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. * * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects * instead of plain stdClass objects diff --git a/libraries/fof/dispatcher/dispatcher.php b/libraries/fof/dispatcher/dispatcher.php index e253b15db7ac9..931ec9a780008 100644 --- a/libraries/fof/dispatcher/dispatcher.php +++ b/libraries/fof/dispatcher/dispatcher.php @@ -4,6 +4,7 @@ * @subpackage dispatcher * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project in 2019 in order to ensure compatibility with PHP 7.3+ versions. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; @@ -521,22 +522,22 @@ public function transparentAuthentication() if (empty($this->fofAuth_Key)) { - continue; + continue 2; } if (!isset($_SERVER['PHP_AUTH_USER'])) { - continue; + continue 2; } if (!isset($_SERVER['PHP_AUTH_PW'])) { - continue; + continue 2; } if ($_SERVER['PHP_AUTH_USER'] != '_fof_auth') { - continue; + continue 2; } $encryptedData = $_SERVER['PHP_AUTH_PW']; @@ -549,7 +550,7 @@ public function transparentAuthentication() if (empty($encryptedData)) { - continue; + continue 2; } $authInfo = $this->_decryptWithTOTP($encryptedData); @@ -558,12 +559,12 @@ public function transparentAuthentication() case 'HTTPBasicAuth_Plaintext': if (!isset($_SERVER['PHP_AUTH_USER'])) { - continue; + continue 2; } if (!isset($_SERVER['PHP_AUTH_PW'])) { - continue; + continue 2; } $authInfo = array( @@ -577,7 +578,7 @@ public function transparentAuthentication() if (empty($jsonencoded)) { - continue; + continue 2; } $authInfo = json_decode($jsonencoded, true); @@ -606,7 +607,7 @@ public function transparentAuthentication() break; default: - continue; + continue 2; break; } diff --git a/libraries/fof/encrypt/aes.php b/libraries/fof/encrypt/aes.php index 25c5c06b6c103..ebcf64bbc828e 100644 --- a/libraries/fof/encrypt/aes.php +++ b/libraries/fof/encrypt/aes.php @@ -4,6 +4,7 @@ * @subpackage encrypt * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/actions.php b/libraries/fof/form/field/actions.php index fc232da742c59..4b789988dadf8 100644 --- a/libraries/fof/form/field/actions.php +++ b/libraries/fof/form/field/actions.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/calendar.php b/libraries/fof/form/field/calendar.php index 40552e6d95302..8a7daec97570c 100644 --- a/libraries/fof/form/field/calendar.php +++ b/libraries/fof/form/field/calendar.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/components.php b/libraries/fof/form/field/components.php index f236632b0eb2d..c3b519bdf83e3 100644 --- a/libraries/fof/form/field/components.php +++ b/libraries/fof/form/field/components.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/imagelist.php b/libraries/fof/form/field/imagelist.php index c0c41ce81e2d0..53b591b0031cb 100644 --- a/libraries/fof/form/field/imagelist.php +++ b/libraries/fof/form/field/imagelist.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/list.php b/libraries/fof/form/field/list.php index 1c9ee7bf01bf0..043a288fbae2b 100644 --- a/libraries/fof/form/field/list.php +++ b/libraries/fof/form/field/list.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/media.php b/libraries/fof/form/field/media.php index 6a26fcb023e83..6b70b47dd2d49 100644 --- a/libraries/fof/form/field/media.php +++ b/libraries/fof/form/field/media.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/field/published.php b/libraries/fof/form/field/published.php index ceea5439cec54..819f1e0b34e01 100644 --- a/libraries/fof/form/field/published.php +++ b/libraries/fof/form/field/published.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/header.php b/libraries/fof/form/header.php index 881b3d81fd777..026fbd623eadf 100644 --- a/libraries/fof/form/header.php +++ b/libraries/fof/form/header.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/form/header/fielddate.php b/libraries/fof/form/header/fielddate.php index 475fcf15f55d4..e7813cfa455c1 100644 --- a/libraries/fof/form/header/fielddate.php +++ b/libraries/fof/form/header/fielddate.php @@ -4,6 +4,7 @@ * @subpackage form * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/include.php b/libraries/fof/include.php index e48b455f8dd6c..24451e59ca3d6 100644 --- a/libraries/fof/include.php +++ b/libraries/fof/include.php @@ -4,6 +4,7 @@ * @subpackage include * @copyright Copyright (C) 2010-2015 Nicholas K. Dionysopoulos * @license GNU General Public License version 2, or later + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. * * @deprecated 4.0 Deprecated without replacement include FOF by your own if required * diff --git a/libraries/fof/utils/installscript/installscript.php b/libraries/fof/utils/installscript/installscript.php index 435b966ae06a8..2af234f69531d 100644 --- a/libraries/fof/utils/installscript/installscript.php +++ b/libraries/fof/utils/installscript/installscript.php @@ -4,6 +4,7 @@ * @subpackage utils * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ defined('FOF_INCLUDED') or die; diff --git a/libraries/fof/view/view.php b/libraries/fof/view/view.php index 5aba563812ef7..9606ca7910c8b 100644 --- a/libraries/fof/view/view.php +++ b/libraries/fof/view/view.php @@ -4,6 +4,7 @@ * @subpackage view * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access defined('FOF_INCLUDED') or die; From 8fdbcb163040ff7b8fd12fb27bbfae76816bdad3 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 11 Feb 2019 16:46:38 +0100 Subject: [PATCH 0092/1831] Prepare 3.9.3 release --- .gitignore | 3 + .../com_admin/postinstall/addnosniff.php | 27 + .../sql/updates/mysql/3.9.3-2019-02-07.sql | 3 + .../updates/postgresql/3.9.3-2019-02-07.sql | 3 + .../sql/updates/sqlazure/3.9.3-2019-02-07.sql | 2 + .../com_banners/models/forms/banner.xml | 1 + .../com_config/model/field/filters.php | 46 +- .../com_config/model/form/application.xml | 1 + .../com_contact/models/forms/contact.xml | 6 + .../com_newsfeeds/models/forms/newsfeed.xml | 1 + .../language/en-GB/en-GB.com_config.ini | 1 + .../language/en-GB/en-GB.com_cpanel.ini | 2 + administrator/manifests/files/joomla.xml | 2 +- administrator/modules/mod_menu/mod_menu.xml | 1 + composer.json | 3 +- composer.lock | 45 +- htaccess.txt | 5 + libraries/cms.php | 12 + libraries/src/Help/Help.php | 4 +- libraries/src/Toolbar/Button/HelpButton.php | 2 +- libraries/src/Version.php | 10 +- libraries/vendor/composer/ClassLoader.php | 2 +- .../vendor/composer/autoload_classmap.php | 7 + libraries/vendor/composer/autoload_psr4.php | 1 + libraries/vendor/composer/autoload_static.php | 15 + libraries/vendor/composer/installed.json | 42 ++ .../typo3/phar-stream-wrapper/composer.json | 24 + .../phar-stream-wrapper/src/Assertable.php | 22 + .../phar-stream-wrapper/src/Behavior.php | 124 +++++ .../phar-stream-wrapper/src/Exception.php | 16 + .../typo3/phar-stream-wrapper/src/Helper.php | 183 +++++++ .../Interceptor/PharExtensionInterceptor.php | 55 ++ .../typo3/phar-stream-wrapper/src/Manager.php | 85 ++++ .../src/PharStreamWrapper.php | 477 ++++++++++++++++++ media/system/js/core-uncompressed.js | 43 +- media/system/js/core.js | 2 +- plugins/user/profile/profiles/profile.xml | 1 + .../suites/libraries/cms/help/JHelpTest.php | 2 +- web.config.txt | 5 + 39 files changed, 1258 insertions(+), 28 deletions(-) create mode 100644 administrator/components/com_admin/postinstall/addnosniff.php create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.9.3-2019-02-07.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.9.3-2019-02-07.sql create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.9.3-2019-02-07.sql create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/composer.json create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/Assertable.php create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/Behavior.php create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/Exception.php create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/Helper.php create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/Interceptor/PharExtensionInterceptor.php create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/Manager.php create mode 100644 libraries/vendor/typo3/phar-stream-wrapper/src/PharStreamWrapper.php diff --git a/.gitignore b/.gitignore index c00c52807c37d..bbf57c0afb767 100644 --- a/.gitignore +++ b/.gitignore @@ -193,6 +193,9 @@ Desktop.ini /libraries/vendor/simplepie/simplepie/build /libraries/vendor/simplepie/simplepie/idn/ReadMe.txt /libraries/vendor/simplepie/simplepie/composer.json +/libraries/vendor/typo3/phar-stream-wrapper/README.md +/libraries/vendor/typo3/phar-stream-wrapper/LICENSE +/libraries/vendor/typo3/phar-stream-wrapper/.gitignore # System Test related files tests/codeception/acceptance.suite.yml diff --git a/administrator/components/com_admin/postinstall/addnosniff.php b/administrator/components/com_admin/postinstall/addnosniff.php new file mode 100644 index 0000000000000..83d7780fa8072 --- /dev/null +++ b/administrator/components/com_admin/postinstall/addnosniff.php @@ -0,0 +1,27 @@ + diff --git a/administrator/components/com_config/model/field/filters.php b/administrator/components/com_config/model/field/filters.php index c0b4645b7eced..7b4e2f8f31f99 100644 --- a/administrator/components/com_config/model/field/filters.php +++ b/administrator/components/com_config/model/field/filters.php @@ -35,6 +35,48 @@ class JFormFieldFilters extends JFormField */ protected function getInput() { + // Load Framework + JHtml::_('jquery.framework'); + + // Add translation string for notification + JText::script('COM_CONFIG_TEXT_FILTERS_NOTE'); + + // Add Javascript + $doc = JFactory::getDocument(); + $doc->addScriptDeclaration(' + jQuery( document ).ready(function( $ ) { + $("#filter-config select").change(function() { + var currentFilter = $(this).children("option:selected").val(); + + if($(this).children("option:selected").val() === "NONE") { + var child = $("#filter-config select[data-parent=" + $(this).attr("data-id") + "]"); + + while(child.length !== 0) { + if(child.children("option:selected").val() !== "NONE") { + alert(Joomla.JText._("COM_CONFIG_TEXT_FILTERS_NOTE")); + break; + } + + child = $("#filter-config select[data-parent=" + child.attr("data-id") + "]"); + } + + return; + } + + var parent = $("#filter-config select[data-id=" + $(this).attr("data-parent") + "]"); + + while(parent.length !== 0) { + if(parent.children("option:selected").val() === "NONE") { + alert(Joomla.JText._("COM_CONFIG_TEXT_FILTERS_NOTE")); + break; + } + + parent = $("#filter-config select[data-id=" + parent.attr("data-parent") + "]") + } + }); + }); + '); + // Get the available user groups. $groups = $this->getUserGroups(); @@ -85,6 +127,8 @@ protected function getInput() $html[] = ' '; $html[] = ' ");c+="",i?i.innerHTML=c:t.writeln(c)},window.changeDynaList=function(e,o,n,r,a){console.warn("window.changeDynaList() is deprecated without a replacement!");for(var i,s,l,d,c=t.adminForm[e],u=n==r;c.firstChild;)c.removeChild(c.firstChild);for(s in i=0,o)o.hasOwnProperty(s)&&(l=o[s])[0]==n&&((d=new Option).value=l[1],d.text=l[2],(u&&a==d.value||!u&&0===i)&&(d.selected=!0),c.options[i++]=d);c.length=i},window.radioGetCheckedValue=function(e){if(console.warn("window.radioGetCheckedValue() is deprecated without a replacement!"),!e)return"";var t,o=e.length;if(void 0===o)return e.checked?e.value:"";for(t=0;t-1?n.options[r].value:null},window.listItemTask=function(t,o){return console.warn("window.listItemTask() is deprecated use Joomla.listItemTask() instead"),e.listItemTask(t,o)},e.listItemTask=function(e,o){var n,r=t.adminForm,a=0,i=r[e];if(!i)return!1;for(;n=r["cb"+a];)n.checked=!1,a++;return i.checked=!0,r.boxchecked.value=1,window.submitform(o),!1},window.submitbutton=function(t){console.warn("window.submitbutton() is deprecated use Joomla.submitbutton() instead"),e.submitbutton(t)},window.submitform=function(t){console.warn("window.submitform() is deprecated use Joomla.submitform() instead"),e.submitform(t)},window.saveorder=function(e,t){console.warn("window.saveorder() is deprecated without a replacement!"),window.checkAll_button(e,t)},window.checkAll_button=function(o,n){var r,a;for(console.warn("window.checkAll_button() is deprecated without a replacement!"),n=n||"saveorder",r=0;r<=o;r++){if(!(a=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");a.checked=!0}e.submitform(n)},e.loadingLayer=function(o,n){if(o=o||"show",n=n||t.body,"load"===o){var r=(e.getOptions("system.paths")||{}).root||"",a=t.createElement("div");a.id="loading-logo",a.style.position="fixed",a.style.top="0",a.style.left="0",a.style.width="100%",a.style.height="100%",a.style.opacity="0.8",a.style.filter="alpha(opacity=80)",a.style.overflow="hidden",a.style["z-index"]="10000",a.style.display="none",a.style["background-color"]="#fff",a.style["background-image"]='url("'+r+'/media/jui/images/ajax-loader.gif")',a.style["background-position"]="center",a.style["background-repeat"]="no-repeat",a.style["background-attachment"]="fixed",n.appendChild(a)}else t.getElementById("loading-logo")||e.loadingLayer("load",n),t.getElementById("loading-logo").style.display="show"==o?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var o in t)t.hasOwnProperty(o)&&(e[o]=t[o]);return e},e.request=function(t){(t=e.extend({url:"",method:"GET",data:null,perform:!0},t)).method=t.data?"POST":t.method.toUpperCase();try{var o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(o.open(t.method,t.url,!0),o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.setRequestHeader("X-Ajax-Engine","Joomla!"),"POST"===t.method){var n=e.getOptions("csrf.token","");n&&o.setRequestHeader("X-CSRF-Token",n),t.headers&&t.headers["Content-Type"]||o.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&o.setRequestHeader(r,t.headers[r]);if(o.onreadystatechange=function(){4===o.readyState&&(200===o.status?t.onSuccess&&t.onSuccess.call(window,o.responseText,o):t.onError&&t.onError.call(window,o))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,o))return o;o.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return o}}(Joomla,document); +Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},function(e,t){"use strict";e.submitform=function(e,o,n){o||(o=t.getElementById("adminForm")),e&&(o.task.value=e),o.noValidate=!n,n?o.hasAttribute("novalidate")&&o.removeAttribute("novalidate"):o.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",o.appendChild(r).click(),o.removeChild(r)},e.submitbutton=function(t){e.submitform(t)},e.Text={strings:{},_:function(t,o){var n=e.getOptions("joomla.jtext");return n&&(this.load(n),e.loadOptions({"joomla.jtext":null})),o=void 0===o?"":o,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:o},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.JText=e.Text,e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,o){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:o},e.loadOptions=function(o){if(!o){for(var n,r,a,i=t.querySelectorAll(".joomla-script-options.new"),s=0,l=0,d=i.length;l=0;s--)(l=t.createElement("div")).innerHTML=r[s],a.appendChild(l);c.appendChild(a)}},e.removeMessages=function(){for(var e=t.getElementById("system-message-container");e.firstChild;)e.removeChild(e.firstChild);e.style.display="none",e.offsetHeight,e.style.display=""},e.ajaxErrorsMessages=function(t,o,n){var r={};if("parsererror"===o){for(var a=t.responseText.trim(),i=[],s=a.length-1;s>=0;s--)i.unshift(["&#",a[s].charCodeAt(),";"].join(""));a=i.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",a)]}else"nocontent"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" "+t.responseJSON.message+""]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" "+t.statusText+""]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(e,o){if(void 0===o&&(o=t.getElementById("adminForm")),o.boxchecked.value=e?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,o.elements["checkall-toggle"]){var n,r,a,i=!0;for(n=0,a=o.elements.length;n-1?n.options[r].value:null},window.listItemTask=function(t,o){return console.warn("window.listItemTask() is deprecated use Joomla.listItemTask() instead"),e.listItemTask(t,o)},e.listItemTask=function(e,o){var n,r=t.adminForm,a=0,i=r[e];if(!i)return!1;for(;n=r["cb"+a];)n.checked=!1,a++;return i.checked=!0,r.boxchecked.value=1,window.submitform(o),!1},window.submitbutton=function(t){console.warn("window.submitbutton() is deprecated use Joomla.submitbutton() instead"),e.submitbutton(t)},window.submitform=function(t){console.warn("window.submitform() is deprecated use Joomla.submitform() instead"),e.submitform(t)},window.saveorder=function(e,t){console.warn("window.saveorder() is deprecated without a replacement!"),window.checkAll_button(e,t)},window.checkAll_button=function(o,n){var r,a;for(console.warn("window.checkAll_button() is deprecated without a replacement!"),n=n||"saveorder",r=0;r<=o;r++){if(!(a=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");a.checked=!0}e.submitform(n)},e.loadingLayer=function(o,n){if(o=o||"show",n=n||t.body,"load"===o){var r=(e.getOptions("system.paths")||{}).root||"",a=t.createElement("div");a.id="loading-logo",a.style.position="fixed",a.style.top="0",a.style.left="0",a.style.width="100%",a.style.height="100%",a.style.opacity="0.8",a.style.filter="alpha(opacity=80)",a.style.overflow="hidden",a.style["z-index"]="10000",a.style.display="none",a.style["background-color"]="#fff",a.style["background-image"]='url("'+r+'/media/jui/images/ajax-loader.gif")',a.style["background-position"]="center",a.style["background-repeat"]="no-repeat",a.style["background-attachment"]="fixed",n.appendChild(a)}else t.getElementById("loading-logo")||e.loadingLayer("load",n),t.getElementById("loading-logo").style.display="show"==o?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var o in t)t.hasOwnProperty(o)&&(e[o]=t[o]);return e},e.request=function(t){(t=e.extend({url:"",method:"GET",data:null,perform:!0},t)).method=t.data?"POST":t.method.toUpperCase();try{var o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(o.open(t.method,t.url,!0),o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.setRequestHeader("X-Ajax-Engine","Joomla!"),"POST"===t.method){var n=e.getOptions("csrf.token","");n&&o.setRequestHeader("X-CSRF-Token",n),t.headers&&t.headers["Content-Type"]||o.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&o.setRequestHeader(r,t.headers[r]);if(o.onreadystatechange=function(){4===o.readyState&&(200===o.status?t.onSuccess&&t.onSuccess.call(window,o.responseText,o):t.onError&&t.onError.call(window,o))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,o))return o;o.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return o}}(Joomla,document); \ No newline at end of file diff --git a/plugins/user/profile/profiles/profile.xml b/plugins/user/profile/profiles/profile.xml index c548885463234..1551dc61e46a3 100644 --- a/plugins/user/profile/profiles/profile.xml +++ b/plugins/user/profile/profiles/profile.xml @@ -83,6 +83,7 @@ id="website" filter="url" size="30" + validate="url" /> 'English (GB) help.joomla.org', 'value' => 'http://help.joomla.org' ); diff --git a/web.config.txt b/web.config.txt index ba448ebc3534c..e15eb645cea8f 100644 --- a/web.config.txt +++ b/web.config.txt @@ -26,6 +26,11 @@ + + + + + From 6629c1f70ad04702938fc29c7aca51ef2a4c2446 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Tue, 12 Feb 2019 09:31:02 +0100 Subject: [PATCH 0093/1831] Implement base bevavior for system dashboard performance improvement --- .../com_cpanel/Entities/SystemItem.php | 18 ++++---- .../com_cpanel/Model/SystemModel.php | 2 +- .../com_cpanel/tmpl/system/default.php | 9 ++-- .../com_cpanel/js/admin-system-loader.es6.js | 42 +++++++++++++++++++ 4 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 build/media_source/com_cpanel/js/admin-system-loader.es6.js diff --git a/administrator/components/com_cpanel/Entities/SystemItem.php b/administrator/components/com_cpanel/Entities/SystemItem.php index ffbe29a8fdaaa..805d1317a5ddc 100644 --- a/administrator/components/com_cpanel/Entities/SystemItem.php +++ b/administrator/components/com_cpanel/Entities/SystemItem.php @@ -33,29 +33,29 @@ class SystemItem private $link; /** - * An optional badge of the item + * An optional type for the ajax request * * @var string|null */ - private $badge; + private $type; /** * Class constructor. * * @param string $title The title of the item * @param string $link The link for the item - * @param string $badge The optional badge for the item + * @param string $type The type, requested by the ajax request * * @since 4.0.0 */ - public function __construct($title, $link, $badge = '') + public function __construct($title, $link, $type = '') { $this->title = $title; $this->link = $link; - if (!empty($badge)) + if (!empty($type)) { - $this->badge = $badge; + $this->type = $type; } } @@ -84,14 +84,14 @@ public function getLink() } /** - * The string to display in the notification badge if there is one. Else null. + * The type to load in the notification badge if there is one. Else null. * * @return string|null * * @since 4.0.0 */ - public function getBadge() + public function getType() { - return $this->badge; + return $this->type; } } diff --git a/administrator/components/com_cpanel/Model/SystemModel.php b/administrator/components/com_cpanel/Model/SystemModel.php index 6edfce0ac1006..253cdbc035161 100644 --- a/administrator/components/com_cpanel/Model/SystemModel.php +++ b/administrator/components/com_cpanel/Model/SystemModel.php @@ -94,7 +94,7 @@ public function getItems() $messages = count($messagesModel->getItems()); $infoSection->addItem( - new SystemItem('MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES', 'index.php?option=com_postinstall', $messages) + new SystemItem('MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES', 'index.php?option=com_postinstall', 'postinstall') ); } diff --git a/administrator/components/com_cpanel/tmpl/system/default.php b/administrator/components/com_cpanel/tmpl/system/default.php index 3c28404b00fc5..4f41df266c098 100644 --- a/administrator/components/com_cpanel/tmpl/system/default.php +++ b/administrator/components/com_cpanel/tmpl/system/default.php @@ -9,8 +9,11 @@ defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +HTMLHelper::_('script', 'com_cpanel/admin-system-loader.js', ['version' => 'auto', 'relative' => true]); + /** @var \Joomla\Component\Cpanel\Administrator\View\System\HtmlView $this */ ?> @@ -25,9 +28,9 @@ getItems() as $item) : ?>
  • getTitle()); ?> - getBadge())) : ?> - - getBadge()); ?> + getType())) : ?> + diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/build/media_source/com_cpanel/js/admin-system-loader.es6.js new file mode 100644 index 0000000000000..735420493b680 --- /dev/null +++ b/build/media_source/com_cpanel/js/admin-system-loader.es6.js @@ -0,0 +1,42 @@ +/** + * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ +(() => { + 'use strict'; + + document.addEventListener('DOMContentLoaded', () => { + // Get the elements + const elements = document.querySelectorAll('.system-counter'); + + for (let i = 0, l = elements.length; l > i; i += 1) { + const type = elements[i].getAttribute('data-type'); + + Joomla.request({ + url: 'index.php?option=com_cpanel&task=system.loadSystemInfo&format=json', + method: 'POST', + data: 'type=' + type, + onSuccess: (response) => { + if (response.count > 0) + { + const elem = document.createElement('span'); + + elem.addAttribute('class', 'pull-right badge badge-pill badge-warning'); + elem.innerHTML = parseInt(response.count); + + elements[i].parentNode.replaceChild(elem, elements[i]); + } + else + { + elements[i].classList.remove('fa-spin', 'fa-spinner'); + elements[i].classList.add('text-success', 'fa-check'); + } + }, + onError: () => { + elements[i].classList.remove('fa-spin', 'fa-spinner'); + elements[i].classList.add('text-danger', 'fa-remove'); + } + }); + } + }); +})(); From 381216fe20bbfd2e18a4ab17f838c5e1a04eeaba Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Tue, 12 Feb 2019 12:58:13 +0100 Subject: [PATCH 0094/1831] Implement ajax calls + interfaces --- .../Controller/SystemController.php | 165 ++++++++++++++++++ .../com_cpanel/Model/SystemModel.php | 58 +----- .../com_cpanel/tmpl/system/default.php | 2 +- .../language/en-GB/en-GB.com_cpanel.ini | 1 + .../com_cpanel/js/admin-system-loader.es6.js | 15 +- 5 files changed, 184 insertions(+), 57 deletions(-) create mode 100644 administrator/components/com_cpanel/Controller/SystemController.php diff --git a/administrator/components/com_cpanel/Controller/SystemController.php b/administrator/components/com_cpanel/Controller/SystemController.php new file mode 100644 index 0000000000000..01a2e309aa300 --- /dev/null +++ b/administrator/components/com_cpanel/Controller/SystemController.php @@ -0,0 +1,165 @@ +input->get('type'); + + $count = 0; + + switch ($type) + { + case 'postinstall': + $count = $this->countPostInstallMessages(); + break; + + case 'installationwarnings': + $count = $this->countInstallWarnings(); + break; + + case 'checkins': + $count = $this->countCheckins(); + break; + + case 'databaseupdate': + $count = $this->countDatabaseUpdates(); + break; + + case 'systemupdate': + $count = $this->countSystemUpdates(); + break; + + case 'extensionupdate': + $count = $this->countExtensionUpdates(); + break; + + case 'extensiondiscover': + $count = $this->countExtensionDiscover(); + break; + + default: + /** + * @TODO: Plugin event to allow custom sections to be added (see SystemModel) + */ + throw new \Exception(Text::_('COM_CPANEL_ERROR_DASHBOARD_TYPE_NOT_SUPPORTED')); + } + + echo new JsonResponse($count); + } + + protected function countPostInstallMessages() + { + return $this->countItems('com_postinstall', 'Messages'); + } + + protected function countInstallWarnings() + { + return $this->countItems('com_installer', 'Warnings'); + } + + protected function countCheckins() + { + return $this->countItems('com_checkin', 'Checkin'); + } + + protected function countDatabaseUpdates() + { + if (!Factory::getUser()->authorise('core.manage', 'com_installer')) + { + throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED')); + } + + $boot = Factory::getApplication()->bootComponent('com_installer'); + $model = $boot->getMVCFactory()->createModel('Database', 'Administrator', ['ignore_request' => true]); + + $changeSet = $model->getItems(); + + $changeSetCount = 0; + + foreach ($changeSet as $item) + { + $changeSetCount += $item['errorsCount']; + } + + return $changeSetCount; + } + + protected function countSystemUpdates() + { + if (!Factory::getUser()->authorise('core.manage', 'com_joomlaupdate')) + { + throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED')); + } + + $boot = Factory::getApplication()->bootComponent('com_joomlaupdate'); + $model = $boot->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]); + + $model->refreshUpdates(true); + + $joomlaUpdate = $model->getUpdateInformation(); + + $hasUpdate = $joomlaUpdate['hasUpdate'] ? $joomlaUpdate['latest'] : ''; + + return $hasUpdate; + } + + protected function countExtensionUpdates() + { + if (!Factory::getUser()->authorise('core.manage', 'com_installer')) + { + throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED')); + } + + $boot = Factory::getApplication()->bootComponent('com_installer'); + $model = $boot->getMVCFactory()->createModel('Discover', 'Administrator', ['ignore_request' => true]); + + $model->discover(); + + $items = count($model->getItems()); + + return $items; + } + + protected function countExtensionDiscover() + { + return $this->countItems('com_installer', 'Discover'); + } + + protected function countItems($extension, $model) + { + if (!Factory::getUser()->authorise('core.manage', $extension)) + { + throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED')); + } + + $boot = Factory::getApplication()->bootComponent($extension); + $model = $boot->getMVCFactory()->createModel($model, 'Administrator', ['ignore_request' => true]); + + $items = count($model->getItems()); + + return $items; + } +} diff --git a/administrator/components/com_cpanel/Model/SystemModel.php b/administrator/components/com_cpanel/Model/SystemModel.php index 253cdbc035161..813e1c7ca9da0 100644 --- a/administrator/components/com_cpanel/Model/SystemModel.php +++ b/administrator/components/com_cpanel/Model/SystemModel.php @@ -64,35 +64,20 @@ public function getItems() if ($user->authorise('core.manage', 'com_checkin')) { - /** @var \Joomla\Component\Checkin\Administrator\Model\CheckinModel $checkinModel */ - $checkinModel = $this->bootComponent('com_checkin')->getMVCFactory()->createModel('Checkin', 'Administrator', ['ignore_request' => true]); - $checkins = count($checkinModel->getItems()); - $maintainSection->addItem( - new SystemItem('MOD_MENU_GLOBAL_CHECKIN', 'index.php?option=com_checkin', $checkins) + new SystemItem('MOD_MENU_GLOBAL_CHECKIN', 'index.php?option=com_checkin', 'checkins') ); } if ($user->authorise('core.manage', 'com_installer')) { - /** @var \Joomla\Component\Installer\Administrator\Extension\InstallerComponent $installerComponent */ - $installerComponent = $this->bootComponent('com_installer'); - - /** @var \Joomla\Component\Installer\Administrator\Model\WarningsModel $warningsModel */ - $warningsModel = $installerComponent->getMVCFactory()->createModel('Warnings', 'Administrator', ['ignore_request' => true]); - $warningMessages = count($warningsModel->getItems()); - $infoSection->addItem( - new SystemItem('MOD_MENU_INFORMATION_WARNINGS', 'index.php?option=com_installer&view=warnings', $warningMessages) + new SystemItem('MOD_MENU_INFORMATION_WARNINGS', 'index.php?option=com_installer&view=warnings', 'installationwarnings') ); } if ($user->authorise('core.manage', 'com_postinstall')) { - /** @var \Joomla\Component\Postinstall\Administrator\Model\MessagesModel $messagesModel */ - $messagesModel = $this->bootComponent('com_postinstall')->getMVCFactory()->createModel('Messages', 'Administrator', ['ignore_request' => true]); - $messages = count($messagesModel->getItems()); - $infoSection->addItem( new SystemItem('MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES', 'index.php?option=com_postinstall', 'postinstall') ); @@ -107,38 +92,19 @@ public function getItems() if ($user->authorise('core.manage', 'com_installer')) { - /** @var \Joomla\Component\Installer\Administrator\Model\DatabaseModel $warningsModel */ - $databaseModel = $installerComponent->getMVCFactory()->createModel('Database', 'Administrator', ['ignore_request' => true]); - $changeSet = $databaseModel->getItems(); - $changeSetCount = 0; - - foreach ($changeSet as $item) - { - $changeSetCount += $item['errorsCount']; - } - $infoSection->addItem( - new SystemItem( - 'MOD_MENU_SYSTEM_INFORMATION_DATABASE', - 'index.php?option=com_installer&view=database', - $changeSetCount === 0 ? '' : $changeSetCount - ) + new SystemItem('MOD_MENU_SYSTEM_INFORMATION_DATABASE', 'index.php?option=com_installer&view=database', 'databaseupdate') ); } // Install if ($user->authorise('core.manage', 'com_installer')) { - /** @var \Joomla\Component\Installer\Administrator\Model\DiscoverModel $discoverModel */ - $discoverModel = $this->bootComponent('com_installer')->getMVCFactory()->createModel('Discover', 'Administrator', ['ignore_request' => true]); - $discoverModel->discover(); - $discoveredExtensions = count($discoverModel->getItems()); - $installSection->addItem( new SystemItem('MOD_MENU_INSTALL_EXTENSIONS', 'index.php?option=com_installer&view=install') ); $installSection->addItem( - new SystemItem('MOD_MENU_INSTALL_DISCOVER', 'index.php?option=com_installer&view=discover', $discoveredExtensions) + new SystemItem('MOD_MENU_INSTALL_DISCOVER', 'index.php?option=com_installer&view=discover', 'extensiondiscover') ); $installSection->addItem( new SystemItem('MOD_MENU_INSTALL_LANGUAGES', 'index.php?option=com_installer&view=languages') @@ -199,27 +165,15 @@ public function getItems() if ($user->authorise('core.manage', 'com_joomlaupdate')) { - /** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $joomlaUpdateModel */ - $joomlaUpdateModel = $this->bootComponent('com_joomlaupdate')->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]); - $joomlaUpdateModel->refreshUpdates(true); - $joomlaUpdate = $joomlaUpdateModel->getUpdateInformation(); - $hasUpdate = $joomlaUpdate['hasUpdate'] ? $joomlaUpdate['latest'] : ''; - $updateSection->addItem( - new SystemItem('MOD_MENU_UPDATE_JOOMLA', 'index.php?option=com_joomlaupdate', $hasUpdate) + new SystemItem('MOD_MENU_UPDATE_JOOMLA', 'index.php?option=com_joomlaupdate', 'systemupdate') ); } if ($user->authorise('core.manage', 'com_installer')) { - Updater::getInstance()->findUpdates(); - - /** @var \Joomla\Component\Installer\Administrator\Model\UpdateModel $updateModel */ - $updateModel = $installerComponent->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]); - $extensionsCount = count($updateModel->getItems()); - $updateSection->addItem( - new SystemItem('MOD_MENU_UPDATE_EXTENSIONS', 'index.php?option=com_installer&view=update', $extensionsCount) + new SystemItem('MOD_MENU_UPDATE_EXTENSIONS', 'index.php?option=com_installer&view=update', 'extensionupdate') ); $updateSection->addItem( diff --git a/administrator/components/com_cpanel/tmpl/system/default.php b/administrator/components/com_cpanel/tmpl/system/default.php index 4f41df266c098..473e297c1f221 100644 --- a/administrator/components/com_cpanel/tmpl/system/default.php +++ b/administrator/components/com_cpanel/tmpl/system/default.php @@ -29,7 +29,7 @@
  • getTitle()); ?> getType())) : ?> -
    From 27b77d54a87c6c860f24896fb68cbcef2027ce87 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Tue, 12 Feb 2019 16:41:46 +0100 Subject: [PATCH 0097/1831] Remove debug --- administrator/templates/atum/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php index 0e6aa43ae0714..a919326716af3 100644 --- a/administrator/templates/atum/index.php +++ b/administrator/templates/atum/index.php @@ -95,7 +95,7 @@ $css .= ':root {' . implode($root) . '}'; } -//$this->addStyleDeclaration($css); +$this->addStyleDeclaration($css); ?> From e0c5008501eba339a2bb7ee756fab88857bc8fb5 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Wed, 13 Feb 2019 12:24:14 +0100 Subject: [PATCH 0098/1831] change font-sizes and colors --- administrator/templates/atum/login.php | 2 +- .../templates/atum/scss/_variables.scss | 20 +++++++------ .../templates/atum/scss/blocks/_global.scss | 28 +++++++++++++++++++ .../templates/atum/scss/blocks/_header.scss | 10 +++---- .../templates/atum/scss/blocks/_login.scss | 13 ++++++--- .../atum/scss/blocks/_quickicons.scss | 2 +- .../templates/atum/scss/bootstrap.scss | 1 - .../atum/scss/pages/_com_cpanel.scss | 8 +++--- .../templates/atum/scss/template.scss | 8 ++++-- .../templates/atum/scss/vendor/_tinymce.scss | 2 +- .../atum/scss/vendor/bootstrap/_buttons.scss | 10 +++++++ .../templates/atum/templateDetails.xml | 8 +++--- 12 files changed, 80 insertions(+), 32 deletions(-) diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index 78695a96fc520..ca63f03535fda 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -128,7 +128,7 @@
    From ef39ed39fa76367b317abf1242c1c0b2c9052183 Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Wed, 13 Feb 2019 15:23:13 +0100 Subject: [PATCH 0099/1831] change size for h1 and h2 --- administrator/templates/atum/login.php | 2 +- administrator/templates/atum/scss/blocks/_global.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index ca63f03535fda..78695a96fc520 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -128,7 +128,7 @@ diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss index 59fe94b145cb7..f1c9cef89e613 100644 --- a/administrator/templates/atum/scss/pages/_com_cpanel.scss +++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss @@ -129,15 +129,20 @@ border: 0.125rem var(--atum-bg-dark) dashed; text-decoration: none; background-color: var(--white); + position: relative; span { position: relative; } - .fa { + .cpanel-add-module-icon { position: absolute; - top: 50%; - left: 25%; - transform: translateY(-50%); + top: 0; + left: 0; + right: 0; + bottom: 0; + } + .fa { font-size: 7rem; + transform: translateX(-100%); } } } From b77cba547c69ae77c2d636770b55c3b261802325 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Sat, 16 Feb 2019 16:38:44 +0100 Subject: [PATCH 0108/1831] Center icon in cpanel add module --- administrator/components/com_cpanel/tmpl/cpanel/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php index 08c97ea0b6154..2f55808d373e1 100644 --- a/administrator/components/com_cpanel/tmpl/cpanel/default.php +++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php @@ -63,7 +63,7 @@
    - +
    From 2f00f2d5727b41ca3d426347fbd9b59f1a0e288a Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Sat, 16 Feb 2019 17:03:56 +0100 Subject: [PATCH 0109/1831] Clean up SCSS variables --- .../templates/atum/scss/_variables.scss | 21 +------------------ .../templates/atum/scss/blocks/_global.scss | 6 +++--- .../templates/atum/scss/blocks/_modals.scss | 2 +- .../atum/scss/blocks/_sidebar-nav.scss | 2 +- .../atum/scss/blocks/_treeselect.scss | 2 +- .../atum/scss/pages/_com_cpanel.scss | 1 + .../atum/scss/vendor/bootstrap/_collapse.scss | 2 +- .../atum/scss/vendor/bootstrap/_table.scss | 4 ++-- 8 files changed, 11 insertions(+), 29 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 3d946de181450..50c432a5e7094 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -46,8 +46,7 @@ $colors: ( success-border: darken(theme-color("success"), 5%), info-border: darken(theme-color("info"), 7%), warning-border: darken(theme-color("warning"), 5%), - danger-border: darken(theme-color("danger"), 5%), - sidebar-bg: #122942, + danger-border: darken(theme-color("danger"), 5%), sidebar-sub-bg: #1b3654, sidebar-text-color: #7189a4, sidebar-link-color: #e3eaf1, @@ -103,17 +102,6 @@ $fa-css-prefix: fa; $fa-font-path: "../../../../media/vendor/font-awesome/fonts"; $roboto-font-path: "../../../../media/vendor/roboto-fontface/fonts"; -// Font weights -$thin-weight: 100; -$extralight-weight: 200; -$light-weight: 300; -$normal-weight: 400; -$medium-weight: 500; -$semibold-weight: 600; -$bold-weight: 700; -$extrabold-weight: 800; -$black-weight: 900; - // Text $body-color: var(--font-color-dark); @@ -123,12 +111,6 @@ $table-bg-accent: rgba(0, 0, 0, .03); $table-border-color: var(--table-border); $table-cell-padding: 8px 12px; -// Buttons + Forms -$btn-border-radius: 0; -$btn-border-radius-lg: 0; -$btn-border-radius-sm: 0; - - // Dropdowns $dropdown-padding-y: 0; $dropdown-border-width: 0; @@ -139,7 +121,6 @@ $dropdown-spacer: 0; // Tabs $nav-tabs-border-width: 0; -$nav-tabs-border-radius: 0; $nav-tabs-link-active-bg: rgba($black, .2); // Tables diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss index 83485f13be486..610977ca3180b 100644 --- a/administrator/templates/atum/scss/blocks/_global.scss +++ b/administrator/templates/atum/scss/blocks/_global.scss @@ -16,11 +16,11 @@ h3, h4, h5, h6 { - font-weight: $bold-weight; + font-weight: $font-weight-bold; } h1 { - font-weight: $normal-weight; + font-weight: $font-weight-normal; } small, @@ -30,7 +30,7 @@ small, legend { font-size: 1.2rem; - font-weight: $bold-weight; + font-weight: $font-weight-bold; ; } diff --git a/administrator/templates/atum/scss/blocks/_modals.scss b/administrator/templates/atum/scss/blocks/_modals.scss index 4ee9aa761f3d7..6766b259d9233 100644 --- a/administrator/templates/atum/scss/blocks/_modals.scss +++ b/administrator/templates/atum/scss/blocks/_modals.scss @@ -37,7 +37,7 @@ } .modal-title { - font-weight: $normal-weight; + font-weight: $font-weight-normal; line-height: $modal-header-height; } diff --git a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss index 581978393f21b..7a8f4ac5ddef5 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss @@ -9,7 +9,7 @@ li { padding-bottom: 3px; font-size: .9rem; - font-weight: $bold-weight; + font-weight: $font-weight-bold; &.nav-header { padding: .5rem 0 .2rem; diff --git a/administrator/templates/atum/scss/blocks/_treeselect.scss b/administrator/templates/atum/scss/blocks/_treeselect.scss index 7dcd7e2fa505e..3371e94955e18 100644 --- a/administrator/templates/atum/scss/blocks/_treeselect.scss +++ b/administrator/templates/atum/scss/blocks/_treeselect.scss @@ -4,7 +4,7 @@ list-style: none; .nav-header { - font-weight: $bold-weight; + font-weight: $font-weight-bold; color: $gray-900; } diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss index f1c9cef89e613..892c098cee927 100644 --- a/administrator/templates/atum/scss/pages/_com_cpanel.scss +++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss @@ -108,6 +108,7 @@ padding-left: 0; font-size: $h5-font-size; color: var(--atum-special-color); + font-weight: $font-weight-normal; } .module-actions { diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_collapse.scss b/administrator/templates/atum/scss/vendor/bootstrap/_collapse.scss index 8092f3b1836b7..e76650af1656a 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_collapse.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_collapse.scss @@ -5,7 +5,7 @@ .card-header { display: block; font-size: $h5-font-size; - font-weight: $bold-weight; + font-weight: $font-weight-bold; line-height: $headings-line-height; } diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss index cd5c68fbafc7a..b1c70c58c7345 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss @@ -5,7 +5,7 @@ thead { th, td { - font-weight: $normal-weight; + font-weight: $font-weight-normal; color: $gray-800; white-space: nowrap; border-bottom: 2px solid $gray-300; @@ -14,7 +14,7 @@ padding: 0; } a { - font-weight: $normal-weight; + font-weight: $font-weight-normal; color: $gray-800; } } From ff42a7e7c35c996336c0359260cc9790539479f9 Mon Sep 17 00:00:00 2001 From: chmst Date: Sun, 17 Feb 2019 00:02:43 +0100 Subject: [PATCH 0110/1831] First changes for quickicons. --- .../language/en-GB/en-GB.mod_quickicon.ini | 15 +- .../mod_quickicon/Dispatcher/Dispatcher.php | 7 +- .../mod_quickicon/Helper/QuickIconHelper.php | 172 +++++++++++++++--- .../modules/mod_quickicon/tmpl/default.php | 2 +- .../atum/scss/blocks/_quickicons.scss | 15 +- layouts/joomla/quickicons/icon.php | 25 ++- 6 files changed, 183 insertions(+), 53 deletions(-) diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini index f194a3a8681d9..0bb394b794462 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini @@ -4,25 +4,16 @@ ; Note : All ini files need to be saved as UTF-8 MOD_QUICKICON="Quick Icons" -MOD_QUICKICON_ADD_NEW_ARTICLE="New Article" +MOD_QUICKICON_ADD_NEW="Add New" MOD_QUICKICON_ARTICLE_MANAGER="Articles" -MOD_QUICKICON_CATEGORY_MANAGER="Categories" +MOD_QUICKICON_CATEGORY_MANAGER="Article Categories" MOD_QUICKICON_CONFIGURATION="Configuration" MOD_QUICKICON_CONTENT="Content" MOD_QUICKICON_EXTENSIONS="Extensions" -MOD_QUICKICON_EXTENSION_MANAGER="Extension Manager" -MOD_QUICKICON_GLOBAL_CONFIGURATION="Global" MOD_QUICKICON_GROUP_DESC="The group of this module (this value is compared with the group value used in Quick Icons plugins to inject icons). The 'mod_quickicon' group always displays the Joomla! core icons." MOD_QUICKICON_GROUP_LABEL="Group" -MOD_QUICKICON_INSTALL_EXTENSIONS="Install Extensions" -MOD_QUICKICON_LANGUAGE_MANAGER="Languages" MOD_QUICKICON_MAINTENANCE="Maintenance" -MOD_QUICKICON_MEDIA_MANAGER="Media" -MOD_QUICKICON_MENU_MANAGER="Menu(s)" -MOD_QUICKICON_MODULE_MANAGER="Modules" +MOD_QUICKICON_MENUITEMS_MANAGER="Menu Items" MOD_QUICKICON_NAV_LABEL="Quick Links" -MOD_QUICKICON_STRUCTURE="Structure" -MOD_QUICKICON_TEMPLATE_MANAGER="Templates" MOD_QUICKICON_USER_MANAGER="Users" -MOD_QUICKICON_USERS="Users" MOD_QUICKICON_XML_DESCRIPTION="This module shows Quick Icons that are visible on the Control Panel (administrator area home page)." diff --git a/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php b/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php index e12ce701f7002..d3ab4d1b70b9c 100644 --- a/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php +++ b/administrator/modules/mod_quickicon/Dispatcher/Dispatcher.php @@ -22,12 +22,9 @@ class Dispatcher extends AbstractModuleDispatcher { /** - * Returns the layout data. This function can be overridden by subclasses to add more - * attributes for the layout. + * Returns the layout data. * - * If false is returned, then it means that the dispatch process should be aborted. - * - * @return array|false + * @return array * * @since 4.0.0 */ diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php index 6aaca00c10be8..7854768dfb0b0 100644 --- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php @@ -11,13 +11,20 @@ defined('_JEXEC') or die; +use Joomla\CMS\Access\Access; use Joomla\CMS\Application\CMSApplication; +use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Router\Route; +use Joomla\Component\Categories\Administrator\Model\CategoriesModel; +use Joomla\Component\Content\Administrator\Model\ArticlesModel; +use Joomla\Component\Installer\Administrator\Model\ManageModel; +use Joomla\Component\Menus\Administrator\Model\ItemsModel; use Joomla\Module\Quickicon\Administrator\Event\QuickIconsEvent; use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; /** * Helper for mod_quickicon @@ -33,7 +40,7 @@ abstract class QuickIconHelper * @since 1.6 */ protected static $buttons = array(); - + /** * Helper method to return button list. * @@ -64,36 +71,44 @@ public static function &getButtons(Registry $params, CMSApplication $application { // Load mod_quickicon language file in case this method is called before rendering the module $application->getLanguage()->load('mod_quickicon'); - + self::$buttons[$key] = array( array( - 'link' => Route::_('index.php?option=com_content&task=article.add'), - 'image' => 'fa fa-pencil-square', - 'text' => Text::_('MOD_QUICKICON_ADD_NEW_ARTICLE'), - 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), + 'amount' => self::countUsers(), + 'link' => Route::_('index.php?option=com_users&task=user.add'), +// 'image' => 'fa fa-users', + 'name' => Text::_('MOD_QUICKICON_USER_MANAGER'), + 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), + 'access' => array('core.manage', 'com_categories', 'core.create', 'com_categories'), 'group' => 'MOD_QUICKICON_CONTENT', ), array( - 'link' => Route::_('index.php?option=com_media'), - 'image' => 'fa fa-image', - 'text' => Text::_('MOD_QUICKICON_MEDIA_MANAGER'), - 'access' => array('core.manage', 'com_media'), + 'amount' => self::countMenuItems(), + 'link' => Route::_('index.php?option=com_menus&task=item.add'), +// 'image' => 'fa fa-list', + 'name' => Text::_('MOD_QUICKICON_MENUITEMS_MANAGER'), + 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), + 'access' => array('core.manage', 'com_menus', 'core.create', 'com_menus'), 'group' => 'MOD_QUICKICON_CONTENT', ), array( - 'link' => Route::_('index.php?option=com_config'), - 'image' => 'fa fa-cog', - 'text' => Text::_('MOD_QUICKICON_GLOBAL_CONFIGURATION'), - 'access' => array('core.manage', 'com_config', 'core.admin', 'com_config'), - 'group' => 'MOD_QUICKICON_CONFIGURATION', + 'amount' => self::countArticles(), + 'link' => Route::_('index.php?option=com_content&task=article.add'), +// 'image' => 'fa fa-pencil-square', + 'name' => Text::_('MOD_QUICKICON_ARTICLE_MANAGER'), + 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), + 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), + 'group' => 'MOD_QUICKICON_CONTENT', ), array( - 'link' => Route::_('index.php?option=com_modules'), - 'image' => 'fa fa-cubes', - 'text' => Text::_('MOD_QUICKICON_MODULE_MANAGER'), - 'access' => array('core.manage', 'com_modules'), - 'group' => 'MOD_QUICKICON_STRUCTURE' - ) + 'amount' => self::countArticleCategories(), + 'link' => Route::_('index.php?option=com_categories&task=category.add'), +// 'image' => 'fa fa-pencil-square', + 'name' => Text::_('MOD_QUICKICON_CATEGORY_MANAGER'), + 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), + 'access' => array('core.manage', 'com_categories', 'core.create', 'com_categories'), + 'group' => 'MOD_QUICKICON_CONTENT', + ), ); } else @@ -114,8 +129,10 @@ public static function &getButtons(Registry $params, CMSApplication $application foreach ($response as $icon) { $default = array( + 'amount' => null, 'link' => null, - 'image' => 'fa fa-cog', + 'name' => null, + 'image' => null, 'text' => null, 'access' => true, 'group' => 'MOD_QUICKICON_EXTENSIONS', @@ -132,4 +149,115 @@ public static function &getButtons(Registry $params, CMSApplication $application return self::$buttons[$key]; } + + /** + * Method to get the number of published articles. + * + * @return integer The amount of published articles + * + * @since 4.0 + */ + private function countArticles() + { + $app = Factory::getApplication(); + + // Get an instance of the generic articles model (administrator) + $model = $app->bootComponent('com_content')->getMVCFactory() + ->createModel('Articles', 'Administrator', ['ignore_request' => true]); + + // Count IDs + $model->setState('list.select', 'COUNT(a.id) as amount'); + + // Set the Start and Limit to 'all' + $model->setState('list.start', 0); + $model->setState('list.limit', 0); + $model->setState('filter.published', 1); + + $result = $model->getItems(); + + return reset($result)->amount; + } + + /** + * Method to get the number of published menu tems. + * + * @return integer The amount of active menu Items + * + * @since 4.0 + */ + private function countMenuItems() + { + $app = Factory::getApplication(); + + // Get an instance of the generic articles model (administrator) + $model = $app->bootComponent('com_menus')->getMVCFactory()->createModel('Items', 'Administrator', ['ignore_request' => true]); + + // Count IDs + $model->setState('list.select', 'COUNT(a.id) as amount'); + + // Set the Start and Limit to 'all' + $model->setState('list.start', 0); + $model->setState('list.limit', 0); + $model->setState('filter.published', 1); + $model->setState('filter.client_id', 0); + + $result = $model->getItems(); + + return reset($result)->amount; + } + + /** + * Method to get the number of extensions + * + * @return integer The amount of active extensions + * + * @since 4.0 + */ + private function countUsers() + { + $app = Factory::getApplication(); + + // Get an instance of the generic articles model (administrator) + $model = $app->bootComponent('com_users')->getMVCFactory()->createModel('Users', 'Administrator', ['ignore_request' => true]); + + // Count IDs + $model->setState('list.select', '*'); + + // Set the Start and Limit to 'all' + $model->setState('list.start', 0); + $model->setState('list.limit', 0); + $model->setState('filter.state', 0); + + $result = $model->getItems(); + + return count($result); + } + + + /** + * Method to get the number of content categories + * + * @return integer The amount of active menu Items + * + * @since 4.0 + */ + private function countArticleCategories() + { + $app = Factory::getApplication(); + + // Get an instance of the generic articles model (administrator) + $model = $app->bootComponent('com_categories')->getMVCFactory()->createModel('Categories', 'Administrator', ['ignore_request' => true]); + + // Count IDs + $model->setState('list.select', 'COUNT(a.id) as amount'); + + // Set the Start and Limit to 'all' + $model->setState('list.start', 0); + $model->setState('list.limit', 0); + $model->setState('filter.published', 1); + + $result = $model->getItems(); + + return count($result); + } } diff --git a/administrator/modules/mod_quickicon/tmpl/default.php b/administrator/modules/mod_quickicon/tmpl/default.php index 30f472424288c..9f5db846e86c2 100644 --- a/administrator/modules/mod_quickicon/tmpl/default.php +++ b/administrator/modules/mod_quickicon/tmpl/default.php @@ -16,7 +16,7 @@ ?> diff --git a/administrator/templates/atum/scss/blocks/_quickicons.scss b/administrator/templates/atum/scss/blocks/_quickicons.scss index 4944330ddd075..f1ff96e2f7516 100644 --- a/administrator/templates/atum/scss/blocks/_quickicons.scss +++ b/administrator/templates/atum/scss/blocks/_quickicons.scss @@ -1,30 +1,31 @@ // Quick Icons .quick-icons { + ul { - display: inline; list-style: none; } - - li { - float: left; + .quickicon-amount { + color: red; + font-size: 3rem; + font-weight: 200; + letter-spacing: -0.5rem; } - a { display: inline-flex; flex-direction: column; - width: 140px; + width: 100%; height: 120px; margin-right: 15px; margin-bottom: 15px; color: var(--atum-link-color); - text-align: center; background: $quickicon-bg; box-shadow: $quickicon-box-shadow; transition: all .25s ease; > div { flex: 1 0 0; + margin: 0 auto; } &:hover, diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php index 72b504c92e216..9882438c38ff3 100644 --- a/layouts/joomla/quickicons/icon.php +++ b/layouts/joomla/quickicons/icon.php @@ -9,23 +9,36 @@ defined('JPATH_BASE') or die; +use Joomla\CMS\Language\Text; + $id = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"'); $target = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"'); $onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"'); $title = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"'); $text = empty($displayData['text']) ? '' : ('' . $displayData['text'] . ''); - $class = ''; -if ($id !== '') +if ($id && is_numeric($id)) { $class = ($displayData['id'] === 'plg_quickicon_joomlaupdate' || $displayData['id'] === 'plg_quickicon_extensionupdate') ? ' class="pulse"' : ''; } ?> -
  • - href=""> -
    -
    +
  • + href=""> + +
    + + +
    + + +
    + +
    + + +
    +
    • \ No newline at end of file From ecdfba1e44ec218593a71b17411493f3a7dd1d5e Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Sun, 17 Feb 2019 14:37:43 +0100 Subject: [PATCH 0111/1831] set bootstrap variables for font-size remove old font-size styles --- .../templates/atum/scss/_variables.scss | 23 +++++++++++++++++ .../templates/atum/scss/blocks/_global.scss | 25 ------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 50c432a5e7094..32c75844652ef 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -189,3 +189,26 @@ $link-hover-color: var(--link-hover); //Time for fadeeffect login-light-bg $fadetime: 1s; + +//Font-sizes +$h1-font-size:2.125rem; +$h2-font-size:1.25rem; +$h3-font-size:3rem; +$h4-font-size:2.125rem; +$h5-font-size:1.5rem; +$h6-font-size:1.25rem; + +$lead-font-size: +$display1-size:1rem; +$display2-size:.875rem; +//$display3-size +//$display4-size +//$blockquote-font-size + +.content{ + font-size: 0.875rem; +} +label, caption{ + font-size: 0.75rem; +} + diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss index 610977ca3180b..93a5b7054dfa8 100644 --- a/administrator/templates/atum/scss/blocks/_global.scss +++ b/administrator/templates/atum/scss/blocks/_global.scss @@ -56,30 +56,5 @@ textarea { word-wrap: break-word; } -// Font-sizes -h1, .h1{ - font-size:2.125rem; -} -h2, .h2{ - font-size:1.25rem; -} -h3, .h3{ - font-size:3rem; -} -h4, .h4{ - font-size:2.125rem; -} -h5, .h5{ - font-size:1.5rem; -} -h6, .h6{ - font-size:1.25rem; -} -.content{ - font-size: 0.875rem; -} -label, caption{ - font-size: 0.75rem; -} From 277879122917c4fb97d877923b0c386008596c2a Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Sun, 17 Feb 2019 15:13:14 +0100 Subject: [PATCH 0112/1831] remove double content --- .../templates/atum/scss/_variables.scss | 29 +++++++------------ .../templates/atum/scss/blocks/_global.scss | 8 +++++ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 32c75844652ef..4c6205ad15b97 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -64,6 +64,7 @@ $colors: ( atum-text-dark: $gray-600, atum-text-light: $white, atum-special-color:$dark-blue, + atum-link-hover:darken($dark-blue, 15%), link-hover: darken(theme-color("atum-link-color"), 15%) ); @@ -98,6 +99,14 @@ $h4-font-size: 1rem; $h5-font-size: .9286rem; $h6-font-size: .8571rem; $font-size-sm: .8rem; +//$lead-font-size +$display1-size:1rem; +$display2-size:.875rem; +//$display3-size +//$display4-size +//$blockquote-font-size +$content-font-size: 0.875rem; +$label-font-size: 0.75rem; $fa-css-prefix: fa; $fa-font-path: "../../../../media/vendor/font-awesome/fonts"; $roboto-font-path: "../../../../media/vendor/roboto-fontface/fonts"; @@ -190,25 +199,7 @@ $link-hover-color: var(--link-hover); //Time for fadeeffect login-light-bg $fadetime: 1s; -//Font-sizes -$h1-font-size:2.125rem; -$h2-font-size:1.25rem; -$h3-font-size:3rem; -$h4-font-size:2.125rem; -$h5-font-size:1.5rem; -$h6-font-size:1.25rem; -$lead-font-size: -$display1-size:1rem; -$display2-size:.875rem; -//$display3-size -//$display4-size -//$blockquote-font-size -.content{ - font-size: 0.875rem; -} -label, caption{ - font-size: 0.75rem; -} + diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss index 93a5b7054dfa8..50e8333879e0b 100644 --- a/administrator/templates/atum/scss/blocks/_global.scss +++ b/administrator/templates/atum/scss/blocks/_global.scss @@ -56,5 +56,13 @@ textarea { word-wrap: break-word; } +.content{ + font-size: $content-font-size; +} +label, caption{ + font-size: $label-font-size; +} + + From 443f4a72d1f3562089091f083084c5b742e5a2a5 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 17 Feb 2019 16:01:39 +0100 Subject: [PATCH 0113/1831] Add h1 header --- .../templates/atum/language/en-GB/en-GB.tpl_atum.ini | 1 + administrator/templates/atum/login.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini index f28bb81a50f55..9569878ad1757 100644 --- a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini +++ b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini @@ -17,6 +17,7 @@ TPL_ATUM_COLORS_SETTINGS_TEXT_DARK_LABEL="Dark Text" TPL_ATUM_COLORS_SETTINGS_TEXT_LIGHT_LABEL="Light Text" TPL_ATUM_COLORS_SETTINGS_LINK_COLOR_LABEL="Link Color" TPL_ATUM_COLORS_SETTINGS_SPECIAL_COLOR_LABEL="Special Color" +TPL_ATUM_LOGIN_HEADING="Joomla Backend Login" TPL_ATUM_LOGIN_SIDEBAR_VIEW_WEBSITE="view website" TPL_ATUM_LOGIN_SITE_TITLE="%s - Administrator Login" TPL_ATUM_MENU="MENU" diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index bf48c8b99e5fe..2ded93289232c 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -135,7 +135,7 @@ + + diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index 1306cca0446bb..cb5d8a85648f2 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -12,32 +12,32 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; use OzdemirBurak\Iris\Color\Hex; /** @var JDocumentHtml $this */ $app = Factory::getApplication(); -$lang = Factory::getLanguage(); +$lang = $app->getLanguage(); // Add JavaScript Frameworks -HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('script', 'vendor/css-vars-ponyfill/css-vars-ponyfill.min.js', ['version' => 'auto', 'relative' => true]); // Load template JS file HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']); // Load template CSS file -HTMLHelper::_('stylesheet', 'bootstrap.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'font-awesome.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'bootstrap.min.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'font-awesome.min.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.min.css', + ['version' => 'auto', 'relative' => true]); // Load custom CSS file -HTMLHelper::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true)); +HTMLHelper::_('stylesheet', 'user.css', ['version' => 'auto', 'relative' => true]); // Load specific language related CSS -HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto')); +HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', + ['version' => 'auto']); // Detecting Active Variables $option = $app->input->getCmd('option', ''); @@ -46,24 +46,22 @@ $sitename = $app->get('sitename'); // Template params -$siteLogo = $this->params->get('siteLogo') +$siteLogo = $this->params->get('siteLogo') ? JUri::root() . $this->params->get('siteLogo') - : $this->params->get('siteLogo', $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg'); + : $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg'; $loginLogo = $this->params->get('loginLogo') ? JUri::root() . $this->params->get('loginLogo') - : $this->params->get('loginLogo', $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'); - + : $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; // Set some meta data $this->setMetaData('viewport', 'width=device-width, initial-scale=1'); // @TODO sync with _variables.scss $this->setMetaData('theme-color', '#1c3d5c'); +$this->addScriptDeclaration('cssVars();'); // Set page title $this->setTitle(Text::sprintf('TPL_ATUM_LOGIN_SITE_TITLE', $sitename)); -$this->addScriptDeclaration('cssVars();'); - // Opacity must be set before displaying the DOM, so don't move to a CSS file $css = ' .container-main > * { @@ -80,70 +78,76 @@ if ($this->params->get('bg-dark')) { - $bgcolor = trim($this->params->get('bg-dark'), '#'); - - list($red, $green, $blue) = str_split($bgcolor, 2); - - $root[] = '--atum-bg-dark: #' . $bgcolor . ';'; - - try { - $color = new Hex($bgcolor); - $colorHsl=$color->toHsl(); - - $root[] = '--atum-contrast: ' . (clone $colorHsl)->lighten(-6)->spin(-30)->toHex() . ';'; - $root[] = '--atum-bg-dark-10: ' . (clone $colorHsl)->desaturate(86)->lighten(20.5)->spin(-6)->toHex() . ';'; - $root[] = '--atum-bg-dark-20: ' . (clone $colorHsl)->desaturate(76)->lighten(16.5)->spin(-6)->toHex() . ';'; - $root[] = '--atum-bg-dark-30: ' . (clone $colorHsl)->desaturate(60)->lighten(12)->spin(-5)->toHex() . ';'; - $root[] = '--atum-bg-dark-40: ' . (clone $colorHsl)->desaturate(41)->lighten(8)->spin(-3)->toHex() . ';'; - $root[] = '--atum-bg-dark-50: ' . (clone $colorHsl)->desaturate(19)->lighten(4)->spin(-1)->toHex() . ';'; - $root[] = '--atum-bg-dark-70: ' . (clone $colorHsl)->lighten(-6)->spin(4)->toHex() . ';'; - $root[] = '--atum-bg-dark-80: ' . (clone $colorHsl)->lighten(-11.5)->spin(7)->toHex() . ';'; - $root[] = '--atum-bg-dark-90: ' . (clone $colorHsl)->desaturate(1)->lighten(-17)->spin(10)->toHex() . ';'; - } catch (Exception $ex) { + $bgcolor = trim($this->params->get('bg-dark'), '#'); + + list($red, $green, $blue) = str_split($bgcolor, 2); + + $root[] = '--atum-bg-dark: #' . $bgcolor . ';'; + + try + { + $color = new Hex($bgcolor); + $colorHsl = $color->toHsl(); + + $root[] = '--atum-contrast: ' . (clone $colorHsl)->lighten(-6)->spin(-30)->toHex() . ';'; + $root[] = '--atum-bg-dark-10: ' . (clone $colorHsl)->desaturate(86)->lighten(20.5)->spin(-6)->toHex() . ';'; + $root[] = '--atum-bg-dark-20: ' . (clone $colorHsl)->desaturate(76)->lighten(16.5)->spin(-6)->toHex() . ';'; + $root[] = '--atum-bg-dark-30: ' . (clone $colorHsl)->desaturate(60)->lighten(12)->spin(-5)->toHex() . ';'; + $root[] = '--atum-bg-dark-40: ' . (clone $colorHsl)->desaturate(41)->lighten(8)->spin(-3)->toHex() . ';'; + $root[] = '--atum-bg-dark-50: ' . (clone $colorHsl)->desaturate(19)->lighten(4)->spin(-1)->toHex() . ';'; + $root[] = '--atum-bg-dark-70: ' . (clone $colorHsl)->lighten(-6)->spin(4)->toHex() . ';'; + $root[] = '--atum-bg-dark-80: ' . (clone $colorHsl)->lighten(-11.5)->spin(7)->toHex() . ';'; + $root[] = '--atum-bg-dark-90: ' . (clone $colorHsl)->desaturate(1)->lighten(-17)->spin(10)->toHex() . ';'; + } + catch (Exception $ex) + { - } + } } if ($this->params->get('bg-light')) { - $root[] = '--atum-bg-light: ' . $this->params->get('bg-light') . ';'; + $root[] = '--atum-bg-light: ' . $this->params->get('bg-light') . ';'; } if ($this->params->get('text-dark')) { - $root[] = '--atum-text-dark: ' . $this->params->get('text-dark') . ';'; + $root[] = '--atum-text-dark: ' . $this->params->get('text-dark') . ';'; } if ($this->params->get('text-light')) { - $root[] = '--atum-text-light: ' . $this->params->get('text-light') . ';'; + $root[] = '--atum-text-light: ' . $this->params->get('text-light') . ';'; } if ($this->params->get('link-color')) { - $linkcolor = trim($this->params->get('link-color'), '#'); + $linkcolor = trim($this->params->get('link-color'), '#'); - list($red, $green, $blue) = str_split($linkcolor, 2); + list($red, $green, $blue) = str_split($linkcolor, 2); - $root[] = '--atum-link-color: #' . $linkcolor . ';'; + $root[] = '--atum-link-color: #' . $linkcolor . ';'; - try { - $color = new Hex($linkcolor); + try + { + $color = new Hex($linkcolor); - $root[] = '--atum-link-hover-color: ' . (clone $color)->darken(20) . ';'; - } catch (Exception $ex) { + $root[] = '--atum-link-hover-color: ' . (clone $color)->darken(20) . ';'; + } + catch (Exception $ex) + { - } + } } if ($this->params->get('special-color')) { - $root[] = '--atum-special-color: ' . $this->params->get('special-color') . ';'; + $root[] = '--atum-special-color: ' . $this->params->get('special-color') . ';'; } if (count($root)) { - $css .= ':root {' . implode($root) . '}'; + $css .= ':root {' . implode($root) . '}'; } $this->addStyleDeclaration($css); @@ -154,14 +158,13 @@ - + From 2f589be7cc9270dd0f273c1ac4446318611a95a4 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Wed, 20 Feb 2019 21:23:42 +0100 Subject: [PATCH 0165/1831] Adding dashboard links --- .../sql/updates/mysql/4.0.0-2019-02-20.sql | 19 ++++ .../updates/postgresql/4.0.0-2019-02-20.sql | 23 +++++ .../com_cpanel/View/Cpanel/HtmlView.php | 11 ++- .../com_menus/Helper/MenusHelper.php | 19 +++- .../com_menus/presets/components.xml | 12 +++ .../components/com_menus/presets/content.xml | 87 +++++++++++++++++++ .../components/com_menus/presets/joomla.xml | 4 + .../components/com_menus/presets/menu.xsd | 8 +- .../components/com_menus/presets/menus.xml | 69 +++++++++++++++ .../components/com_menus/presets/users.xml | 73 ++++++++++++++++ .../language/en-GB/en-GB.mod_menu.ini | 6 ++ .../modules/mod_menu/tmpl/default_submenu.php | 12 ++- .../templates/atum/scss/blocks/_sidebar.scss | 11 +++ 13 files changed, 343 insertions(+), 11 deletions(-) create mode 100644 administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-20.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-20.sql create mode 100644 administrator/components/com_menus/presets/components.xml create mode 100644 administrator/components/com_menus/presets/content.xml create mode 100644 administrator/components/com_menus/presets/menus.xml create mode 100644 administrator/components/com_menus/presets/users.xml diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-20.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-20.sql new file mode 100644 index 0000000000000..7b2c1a9e359b1 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-20.sql @@ -0,0 +1,19 @@ +INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES +('Content Submenu', '', NULL, 1, 'cpanel-content', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"content","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); + +INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0); + +INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES +('Menus Submenu', '', NULL, 1, 'cpanel-menus', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"menus","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); + +INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0); + +INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES +('Components Submenu', '', NULL, 1, 'cpanel-components', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"components","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); + +INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0); + +INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES +('Users Submenu', '', NULL, 1, 'cpanel-users', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"users","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); + +INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0); diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-20.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-20.sql new file mode 100644 index 0000000000000..2ebd1f5be4a30 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-20.sql @@ -0,0 +1,23 @@ +INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES +('Content Submenu', '', NULL, 1, 'cpanel-content', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"content","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*') +RETURNING id INTO lastmoduleid; + +INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0); + +INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES +('Menus Submenu', '', NULL, 1, 'cpanel-menus', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"menus","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*') +RETURNING id INTO lastmoduleid; + +INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0); + +INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES +('Components Submenu', '', NULL, 1, 'cpanel-components', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"components","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*') +RETURNING id INTO lastmoduleid; + +INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0); + +INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES +('Users Submenu', '', NULL, 1, 'cpanel-content', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"users","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*') +RETURNING id INTO lastmoduleid; + +INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0); diff --git a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php index 268b77f4c5cd2..b9c8396616f65 100644 --- a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php +++ b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php @@ -38,6 +38,13 @@ class HtmlView extends BaseHtmlView */ protected $quickicons = null; + /** + * Moduleposition to load + * + * @var string + */ + protected $position = null; + /** * Execute and display a template script. * @@ -55,8 +62,8 @@ public function display($tpl = null) // Display the cpanel modules $dashboard = $app->input->getCmd('dashboard'); - $position = $dashboard ? 'cpanel-' . $dashboard : 'cpanel'; - $this->modules = ModuleHelper::getModules($position); + $this->position = $dashboard ? 'cpanel-' . $dashboard : 'cpanel'; + $this->modules = ModuleHelper::getModules($this->position); $quickicons = $dashboard ? 'icon-' . $dashboard : 'icon'; $this->quickicons = ModuleHelper::getModules($quickicons); diff --git a/administrator/components/com_menus/Helper/MenusHelper.php b/administrator/components/com_menus/Helper/MenusHelper.php index f73a12f1667e2..26be43d3c7763 100644 --- a/administrator/components/com_menus/Helper/MenusHelper.php +++ b/administrator/components/com_menus/Helper/MenusHelper.php @@ -613,6 +613,10 @@ public static function getPresets() static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml'); static::addPreset('system', 'JLIB_MENUS_PRESET_SYSTEM', JPATH_ADMINISTRATOR . '/components/com_menus/presets/system.xml'); static::addPreset('user', 'JLIB_MENUS_PRESET_USER', JPATH_ADMINISTRATOR . '/components/com_menus/presets/user.xml'); + static::addPreset('content', 'JLIB_MENUS_PRESET_CONTENT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/content.xml'); + static::addPreset('menus', 'JLIB_MENUS_PRESET_MENUS', JPATH_ADMINISTRATOR . '/components/com_menus/presets/menus.xml'); + static::addPreset('components', 'JLIB_MENUS_PRESET_COMPONENTS', JPATH_ADMINISTRATOR . '/components/com_menus/presets/components.xml'); + static::addPreset('users', 'JLIB_MENUS_PRESET_USERS', JPATH_ADMINISTRATOR . '/components/com_menus/presets/users.xml'); // Load from template folder automatically $app = Factory::getApplication(); @@ -824,9 +828,19 @@ protected static function loadXml($elements, $parent, $replace = array()) } // Iterate over the matching records, items goes in the same level (not $item->submenu) as this node. - foreach ($results as $result) + if ('self' == (string) $element['sql_target']) { - static::loadXml($element->menuitem, $parent, $result); + foreach ($results as $result) + { + static::loadXml($element->menuitem, $child, $result); + } + } + else + { + foreach ($results as $result) + { + static::loadXml($element->menuitem, $parent, $result); + } } } } @@ -869,6 +883,7 @@ protected static function parseXmlNode($node, $replace = array()) $item->scope = (string) $node['scope'] ?: 'default'; $item->permission = (string) $node['permission']; $item->ajaxbadge = (string) $node['ajax-badge']; + $item->dashboard = (string) $node['dashboard']; $item->setParams(new Registry(trim($node->params))); $item->getParams()->set('menu-permission', (string) $node['permission']); diff --git a/administrator/components/com_menus/presets/components.xml b/administrator/components/com_menus/presets/components.xml new file mode 100644 index 0000000000000..ae9bb688864bb --- /dev/null +++ b/administrator/components/com_menus/presets/components.xml @@ -0,0 +1,12 @@ + + + + diff --git a/administrator/components/com_menus/presets/content.xml b/administrator/components/com_menus/presets/content.xml new file mode 100644 index 0000000000000..6612b676bd1ea --- /dev/null +++ b/administrator/components/com_menus/presets/content.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml index 539424ed4dfb3..5b84b73fa6327 100644 --- a/administrator/components/com_menus/presets/joomla.xml +++ b/administrator/components/com_menus/presets/joomla.xml @@ -15,6 +15,7 @@ title="MOD_MENU_COM_CONTENT" type="heading" class="class:file-text" + dashboard="content" > - - - - - + @@ -75,5 +71,7 @@ + + diff --git a/administrator/components/com_menus/presets/menus.xml b/administrator/components/com_menus/presets/menus.xml new file mode 100644 index 0000000000000..93dd60d778ed1 --- /dev/null +++ b/administrator/components/com_menus/presets/menus.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + diff --git a/administrator/components/com_menus/presets/users.xml b/administrator/components/com_menus/presets/users.xml new file mode 100644 index 0000000000000..867d49a2673b7 --- /dev/null +++ b/administrator/components/com_menus/presets/users.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini index 10a93ddb1e9d0..a92e31b094911 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.ini @@ -131,3 +131,9 @@ MOD_MENU_UPDATE_JOOMLA="Joomla" MOD_MENU_UPDATE_SOURCES="Update Sources" MOD_MENU_USER_PROFILE="My Profile" MOD_MENU_XML_DESCRIPTION="This module displays an administrator menu module." + + +MOD_MENU_DASHBOARD_LINK="Dashboard" +MOD_MENU_QUICKTASK_NEW="New Item" +MOD_MENU_COM_CONTENT_MANAGE="Content Settings" +MOD_MENU_COM_CONTENT_MISC="Modules & Media" diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php index b06ff82bc4a81..5f690988b9d65 100644 --- a/administrator/modules/mod_menu/tmpl/default_submenu.php +++ b/administrator/modules/mod_menu/tmpl/default_submenu.php @@ -105,12 +105,20 @@ echo '' . Text::_($current->get('title')) . ''; } +if ($current->dashboard) +{ + echo ''; +} + if ($current->getParams()->get('menu-quicktask', false)) { $params = $current->getParams(); $user = $this->application->getIdentity(); $link = $params->get('menu-quicktask-link'); - $icon = $params->get('menu-quicktask-icon', 'new'); + $icon = $params->get('menu-quicktask-icon', 'plus'); $title = $params->get('menu-quicktask-title', 'MOD_MENU_QUICKTASK_NEW'); $permission = $params->get('menu-quicktask-permission'); $scope = $current->scope !== 'default' ? $current->scope : null; @@ -118,7 +126,7 @@ if (!$permission || $user->authorise($permission, $scope)) { echo ''; - echo ''; + echo ''; echo '' . Text::_($title) . ''; echo ''; } diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index d76d947cb1f68..56cc6b7013a43 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -69,6 +69,17 @@ li { color: var(--atum-text-light); list-style-type: none; + position: relative; + > a.btn-dashboard { + position: absolute; + right: 40px; + height: 44px; + top: 0; + display: none; + } + &:hover > a.btn-dashboard { + display:block; + } } // All links From 3fe6d8f9a000cbd53a8de5da48d69b0f3b0d321a Mon Sep 17 00:00:00 2001 From: chmst Date: Wed, 20 Feb 2019 22:28:12 +0100 Subject: [PATCH 0166/1831] add media icon, fix permission --- .../language/en-GB/en-GB.mod_quickicon.ini | 1 + .../mod_quickicon/Helper/QuickIconHelper.php | 44 ++++++++++++------- .../modules/mod_quickicon/mod_quickicon.xml | 10 +++++ layouts/joomla/quickicons/icon.php | 5 ++- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini index 332a9e2dc8d9d..02e0efd2eab6e 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini @@ -24,6 +24,7 @@ MOD_QUICKICON_MODULE_MANAGER="Modules" MOD_QUICKICON_NAV_LABEL="Quick Links" MOD_QUICKICON_SHOW_CATEGORIES_LABEL="Show Categories Icon" MOD_QUICKICON_SHOW_CHECKINS_LABEL="Show Checkin Icon" +MOD_QUICKICON_SHOW_MEDIA_LABEL="Show Media Icon" MOD_QUICKICON_SHOW_MENUITEMS_LABEL="Show MenuItems Icon" MOD_QUICKICON_SHOW_MODULES_LABEL="Show Modules Icon" MOD_QUICKICON_SHOW_USERS_LABEL="Show User Icon" diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php index 4ad9fee2553bf..5abbb6f7ae0fd 100644 --- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php @@ -64,11 +64,11 @@ public static function &getButtons(Registry $params, CMSApplication $application } $key = (string) $params; - + if (!isset(self::$buttons[$key])) { $context = $params->get('context', 'mod_quickicon'); - + self::$buttons[$key] = []; if ($context === 'mod_quickicon') @@ -76,8 +76,6 @@ public static function &getButtons(Registry $params, CMSApplication $application // Load mod_quickicon language file in case this method is called before rendering the module $application->getLanguage()->load('mod_quickicon'); - - self::$buttons[$key][] = [ 'link' => Route::_('index.php?option=com_config'), @@ -95,7 +93,7 @@ public static function &getButtons(Registry $params, CMSApplication $application 'link' => Route::_('index.php?option=com_users&task=user.add'), 'name' => Text::_('MOD_QUICKICON_USER_MANAGER'), 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), - 'access' => array('core.manage', 'com_categories', 'core.create', 'com_categories'), + 'access' => array('core.manage', 'com_users', 'core.create', 'com_users'), 'group' => 'MOD_QUICKICON_USERS', ]; } @@ -122,21 +120,33 @@ public static function &getButtons(Registry $params, CMSApplication $application 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), 'group' => 'MOD_QUICKICON_CONTENT', ]; - + if ($params->get('show_categories', '1')) { - self::$buttons[$key][] = - [ - 'amount' => self::countArticleCategories(), - 'link' => Route::_('index.php?option=com_categories&task=category.add'), - 'name' => Text::_('MOD_QUICKICON_CATEGORY_MANAGER'), - 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), - 'access' => array('core.manage', 'com_categories', 'core.create', 'com_categories'), - 'group' => 'MOD_QUICKICON_CONTENT', + self::$buttons[$key][] = + [ + 'amount' => self::countArticleCategories(), + 'link' => Route::_('index.php?option=com_categories&task=category.add'), + 'name' => Text::_('MOD_QUICKICON_CATEGORY_MANAGER'), + 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), + 'access' => array('core.manage', 'com_categories', 'core.create', 'com_categories'), + 'group' => 'MOD_QUICKICON_CONTENT', - ]; + ]; } - + + if ($params->get('show_media', '1')) + { + self::$buttons[$key][] = + [ + 'image' => 'fa fa-image', + 'link' => Route::_('index.php?option=com_media'), + 'text' => Text::_('MOD_QUICKICON_MEDIA_MANAGER'), + 'access' => array('core.manage', 'com_media'), + 'group' => 'MOD_QUICKICON_CONTENT', + ]; + } + if ($params->get('show_modules', '1')) { self::$buttons[$key][] = @@ -149,7 +159,7 @@ public static function &getButtons(Registry $params, CMSApplication $application ]; } - + if ($params->get('show_checkin', '1')) { self::$buttons[$key][] = diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml index f4dd3d828a13e..370ef0d6b67b2 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.xml +++ b/administrator/modules/mod_quickicon/mod_quickicon.xml @@ -50,6 +50,16 @@     + + + +
  • href=""> + -
    +
    Date: Wed, 20 Feb 2019 22:52:20 +0100 Subject: [PATCH 0167/1831] Adding install SQL --- installation/sql/mysql/joomla.sql | 14 ++++++++++++-- installation/sql/postgresql/joomla.sql | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 101a0ea897d95..de9485092a57d 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1331,7 +1331,12 @@ INSERT INTO `#__modules` (`id`, `asset_id`, `title`, `note`, `content`, `orderin (79, 52, 'Multilanguage status', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), (86, 53, 'Joomla Version', '', '', 1, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), (87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_sampledata', 6, 1, '{"bootstrap_size": "6"}', 1, '*'), -(88, 65, 'Need support?', '', '

    You can find help here:
    Joomla! Support forum
    Joomla! Documentation
    Joomla! News

    ', 1, 'sidebar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":1,"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); +(88, 65, 'Need support?', '', '

    You can find help here:
    Joomla! Support forum
    Joomla! Documentation
    Joomla! News

    ', 1, 'sidebar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":1,"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(89, 0, 'System Submenu', '', NULL, 1, 'cpanel-system', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"system","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(90, 0, 'Content Submenu', '', NULL, 1, 'cpanel-content', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"content","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(91, 0, 'Menus Submenu', '', NULL, 1, 'cpanel-menus', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"menus","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(92, 0, 'Components Submenu', '', NULL, 1, 'cpanel-components', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"components","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(93, 0, 'Users Submenu', '', NULL, 1, 'cpanel-users', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"users","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); -- -------------------------------------------------------- @@ -1367,7 +1372,12 @@ INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (79, 0), (86, 0), (87, 0), -(88, 0); +(88, 0), +(89, 0), +(90, 0), +(91, 0), +(92, 0), +(93, 0); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index deda6927e884b..bbfbc57a137c3 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1332,7 +1332,12 @@ INSERT INTO "#__modules" ("id", "asset_id", "title", "note", "content", "orderin (79, 52, 'Multilanguage status', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), (86, 53, 'Joomla Version', '', '', 1, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), (87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_sampledata', 6, 1, '{"bootstrap_size": "6"}', 1, '*'), -(88, 65, 'Need support?', '', '

    You can find help here:
    Joomla! Support forum
    Joomla! Documentation
    Joomla! News

    ', 1, 'sidebar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":1,"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); +(88, 65, 'Need support?', '', '

    You can find help here:
    Joomla! Support forum
    Joomla! Documentation
    Joomla! News

    ', 1, 'sidebar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":1,"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(89, 0, 'System Submenu', '', NULL, 1, 'cpanel-system', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"system","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(90, 0, 'Content Submenu', '', NULL, 1, 'cpanel-content', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"content","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(91, 0, 'Menus Submenu', '', NULL, 1, 'cpanel-menus', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"menus","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(92, 0, 'Components Submenu', '', NULL, 1, 'cpanel-components', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"components","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'), +(93, 0, 'Users Submenu', '', NULL, 1, 'cpanel-content', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"users","layout":"_:default","moduleclass_sfx":"","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*'); SELECT setval('#__modules_id_seq', 88, false); @@ -1368,7 +1373,12 @@ INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (79, 0), (86, 0), (87, 0), -(88, 0); +(88, 0), +(89, 0), +(90, 0), +(91, 0), +(92, 0), +(93, 0); -- -- Table structure for table `#__newsfeeds` From 0f205914c12259fa4a26fd62779cf8084bf50856 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 06:32:56 +0100 Subject: [PATCH 0168/1831] Change Menu styles --- .../templates/atum/scss/_variables.scss | 6 +- .../templates/atum/scss/blocks/_sidebar.scss | 123 ++++++++++++------ .../atum/scss/vendor/bootstrap/_table.scss | 3 + 3 files changed, 86 insertions(+), 46 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index ae8965a6c440f..c6b3a84a7ff5e 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -56,7 +56,7 @@ $theme-colors: map-merge(( danger: $red, light: $gray-100, dark: $gray-900, - atum-link-color:$blue-a700 + atum-link-color:$color-60 ), $theme-colors); $colors: ( @@ -79,8 +79,8 @@ $colors: ( atum-text-dark: $gray-600, atum-text-light: $white, atum-special-color:$dark-blue, - atum-link-color: $blue-a700, - atum-link-hover-color: darken($blue-a700, 15%), + atum-link-color: $color-60, + atum-link-hover-color: darken($color-60, 15%), //atum-bg-dark-light: lighten($blue, 20%), //atum-bg-dark-bright: lighten($blue, 40%), // atum-bg-body: adjust-color($color-10, $alpha: 0.7), diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 743ca36b6dab2..8eed3d52a295e 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -9,6 +9,12 @@ @include media-breakpoint-down(sm) { padding-left: 0; } + + &.closed { + .main-nav { + max-width:3rem; + } + } } .sidebar-wrapper { @@ -51,7 +57,6 @@ } } - } &.transit-wider { @@ -76,19 +81,17 @@ width: $sidebar-width; opacity: 1; - ul.collapse{ - li.dropdown-submenu{ - display:block; + ul.collapse { + li.dropdown-submenu { + display: block; } } - .open> a{ - box-shadow: 0 2px 4px -4px rgba(0, 0, 0, 0.4); + .open > a { + box-shadow: 0 2px 4px -4px rgba(0, 0, 0, 0.5); } - - // All list items li { color: var(--atum-text-light); @@ -99,6 +102,8 @@ a { position: relative; color: var(--atum-text-light); + height: 3.2rem; + line-height: 3.2rem; &:hover { @@ -106,10 +111,14 @@ text-decoration: none; } - &:focus{ - -moz-box-shadow: inset 0 0 2px 2px var(--atum-contrast); + &:focus { + /* -moz-box-shadow: inset 0 0 2px 2px var(--atum-contrast); -webkit-box-shadow: inset 0 0 2px 2px var(--atum-contrast); - box-shadow: inset 0 0 2px 2px var(--atum-contrast); + box-shadow: inset 0 0 2px 2px var(--atum-contrast);*/ + outline-offset: -0.25rem; + outline-color: var(--atum-contrast); + outline-width: 0.25rem; + } } @@ -121,7 +130,7 @@ > a { display: block; - padding: 10px 6px; + padding: 0 0.35rem; &:hover { background-color: var(--atum-bg-dark-80); @@ -130,15 +139,17 @@ &.active > a { //background-color: rgba(0, 0, 0, .4); + box-shadow: 0 1px 4px -1px rgba(0, 0, 0, .5); + z-index: 10; &::before { - /* position: absolute; - top: 0; - bottom: 0; - left: 0; - width: 3px; - content: ""; - background-color: var(--atum-bg-dark);*/ + /* position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 0.25rem; + content: ""; + background-color: var(--atum-contrast);*/ } } } @@ -146,8 +157,8 @@ // 2nd level items ul { padding: 0; - - + z-index: 20; + background-color: var(--atum-bg-dark-70); li { position: relative; @@ -156,7 +167,7 @@ a { display: block; - padding: 4px 5px 4px 34px; + padding: 0 1.25rem 0 1.25rem; color: var(--atum-text-light); flex-basis: 100%; @@ -165,21 +176,22 @@ background-color: rgba(0, 0, 0, .4); } - &.active { + &.active > a { color: $white; - background-color: var(--atum-bg-dark); - } - - &::before { - position: absolute; - top: 12px; - left: 18px; - width: .5rem; - height: .5rem; - content: ""; - //background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiBmaWxsPSJ3aGl0ZSI+PHBhdGggZD0iTTI1NiA4QzExOSA4IDggMTE5IDggMjU2czExMSAyNDggMjQ4IDI0OCAyNDgtMTExIDI0OC0yNDhTMzkzIDggMjU2IDh6bTAgNDQ4Yy0xMTAuNSAwLTIwMC04OS41LTIwMC0yMDBTMTQ1LjUgNTYgMjU2IDU2czIwMCA4OS41IDIwMCAyMDAtODkuNSAyMDAtMjAwIDIwMHoiLz48L3N2Zz4="); - opacity: .5; - } + background-color: var(--atum-bg-dark-80); + box-shadow: 0 1px 4px -1px rgba(0, 0, 0, .5); + z-index: 20; + + &::before { + position: absolute; + top: 0.15rem; + bottom: 0.15rem; + left: 0; + width: 0.25rem; + content: ""; + background-color: var(--atum-contrast); + } + } &.menu-quicktask { flex-basis: 2.5rem; @@ -191,12 +203,15 @@ width: 0; } + &:hover { + background: var(--atum-contrast); + color: var(--atum-bg-dark-90); + } } } .has-arrow::after { - top: 16px; width: .4rem; height: .4rem; border-color: var(--atum-text-light); @@ -205,18 +220,40 @@ // 3rd level items ul { - background-color:var(--atum-bg-dark-80); + background-color: var(--atum-bg-dark-80); + z-index: 30; a { - padding-left: 34px; + padding-left: 1.25rem; + + &.active { + color: $white; + background-color: var(--atum-bg-dark-90); + + &.active > a { + box-shadow: 0 1px 4px -1px rgba(0, 0, 0, .5); + z-index: 20; + } + + &::before { + position: absolute; + top: 0.15rem; + bottom: 0.15rem; + left: 0; + width: 0.275rem; + content: ""; + background-color: var(--atum-contrast); + } + + } } a::before { - left: 34px; + left: 1.25rem; } //4th level - ul{ + ul { background-color: var(--atum-bg-dark-90); } } @@ -239,7 +276,7 @@ } .menuitem-group { - margin-top: 10px; + margin-top: 0.65rem; font-size: .75rem; text-transform: uppercase; letter-spacing: 2px; @@ -265,7 +302,7 @@ // Dropdown indicator .has-arrow::after { position: absolute; - top: 21px; + top: 50%; right: 0.9em; width: .5rem; height: .5rem; diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss index b1c70c58c7345..33ae3fddd806f 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss @@ -3,6 +3,9 @@ .table { thead { + th { + font-size: $label-font-size; + } th, td { font-weight: $font-weight-normal; From f6d28130a1134af175a4f8dafc5952e0f7968383 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 07:17:26 +0100 Subject: [PATCH 0169/1831] Style dividers in sidebar --- administrator/templates/atum/scss/blocks/_sidebar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 8eed3d52a295e..24acb1545f397 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -271,8 +271,8 @@ .divider { height: 1px; margin: 4px 18px; - background-color: var(--atum-bg-dark-70); - opacity: .2; + background-color: var(--atum-bg-dark-90); + opacity: .7; } .menuitem-group { From caf7e0ef5aa91d42283eb19e4c8780111bdfe1bd Mon Sep 17 00:00:00 2001 From: nadjak77 Date: Thu, 21 Feb 2019 08:20:46 +0100 Subject: [PATCH 0170/1831] change hover color for add modul on dashboard --- administrator/templates/atum/scss/pages/_com_cpanel.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss index f6bf6c0571657..3f549c6087d7b 100644 --- a/administrator/templates/atum/scss/pages/_com_cpanel.scss +++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss @@ -1,4 +1,4 @@ -// com_cpanel +cpanel-add-module-icon// com_cpanel .com-cpanel { @@ -134,7 +134,7 @@ transition: all .3s ease-in; @include hover-focus-active() { background-color: var(--atum-bg-dark); - color: var(--atum-link-hover-color); + color: var(--atum-text-light); border-color: var(--white); .cpanel-add-module-icon { .fa { From 8beda83451bc142765297f361288cb1ae68b28d0 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 09:13:41 +0100 Subject: [PATCH 0171/1831] Change background to new color-scale background --- .../templates/atum/scss/_variables.scss | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index c6b3a84a7ff5e..89e0b2448fedc 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -31,12 +31,14 @@ $cyan: #108193; //color-60 is the base $color-60: $blue; -$color-0: adjust-color($color-60, $hue: -5%, $saturation: -93%, $lightness: +24.5%); -$color-10: adjust-color($color-60, $hue: -6%, $saturation: -86%, $lightness: +20.5%); -$color-20: adjust-color($color-60, $hue: -6%, $saturation: -76%, $lightness: +16.5%); -$color-30: adjust-color($color-60, $hue: -5%, $saturation: -60%, $lightness: +12%); -$color-40: adjust-color($color-60, $hue: -3%, $saturation: -41%, $lightness: +8%); -$color-50: adjust-color($color-60, $hue: -1%, $saturation: -19%, $lightness: +4%); + +$color-0: adjust-color($color-60, $hue: -5%, $saturation: -91%, $lightness: +71.4%); +$color-5: adjust-color($color-60, $hue: -6%, $saturation: -86%, $lightness: +65.1%); +$color-10: adjust-color($color-60, $hue: -6%, $saturation: -82%, $lightness: +59.4%); +$color-20: adjust-color($color-60, $hue: -6%, $saturation: -76%, $lightness: +47.3%); +$color-30: adjust-color($color-60, $hue: -5%, $saturation: -57%, $lightness: +34.3%); +$color-40: adjust-color($color-60, $hue: -3%, $saturation: -39%, $lightness: +21.4%); +$color-50: adjust-color($color-60, $hue: -1%, $saturation: -18%, $lightness: +10%); @@ -75,7 +77,7 @@ $colors: ( focus: #39f, table-border: $gray-300, atum-bg-dark: $blue, - atum-bg-light: $light-blue, + atum-bg-light: $color-5, atum-text-dark: $gray-600, atum-text-light: $white, atum-special-color:$dark-blue, From 5966b13b52708b7c456f7999e17b2f667ed57aed Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 09:19:20 +0100 Subject: [PATCH 0172/1831] Style Add Dashboard Module --- .../templates/atum/scss/pages/_com_cpanel.scss | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss index 3f549c6087d7b..839d091757747 100644 --- a/administrator/templates/atum/scss/pages/_com_cpanel.scss +++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss @@ -127,15 +127,18 @@ cpanel-add-module-icon// com_cpanel } } .cpanel-add-module { - border: 0.125rem var(--atum-bg-dark) dashed; - text-decoration: none; - background-color: var(--white); - position: relative; + background-color: var(--atum-bg-light); + color: var(--atum-text-dark); + border: 0.125rem var(--white) dashed; + + position: relative; transition: all .3s ease-in; + @include hover-focus-active() { - background-color: var(--atum-bg-dark); - color: var(--atum-text-light); - border-color: var(--white); + border-color: var(--atum-bg-dark); + text-decoration: none; + background-color: var(--white); + .cpanel-add-module-icon { .fa { opacity: 0.3; From a5a333b0c190924df8659e46697a114416f25c71 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 09:23:42 +0100 Subject: [PATCH 0173/1831] Style Sidebar Dividers --- administrator/templates/atum/scss/_variables.scss | 4 +++- administrator/templates/atum/scss/blocks/_sidebar.scss | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 89e0b2448fedc..6930fbe2b84cc 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -76,7 +76,7 @@ $colors: ( white-offset: #fefefe, focus: #39f, table-border: $gray-300, - atum-bg-dark: $blue, + atum-bg-dark: $color-60, atum-bg-light: $color-5, atum-text-dark: $gray-600, atum-text-light: $white, @@ -89,9 +89,11 @@ $colors: ( // atum-bg-surface: #fff, // atum-bg-sidebar-base: $color-60, atum-contrast: $color-constrast, + atum-bg-dark-5: $color-5, atum-bg-dark-10: $color-10, atum-bg-dark-20: $color-20, atum-bg-dark-40: $color-40, + atum-bg-dark-50: $color-50, atum-bg-dark-70: $color-70, atum-bg-dark-80: $color-80, atum-bg-dark-90: $color-90, diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 24acb1545f397..7dc0a3fe739d9 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -271,7 +271,7 @@ .divider { height: 1px; margin: 4px 18px; - background-color: var(--atum-bg-dark-90); + background-color: var(--atum-bg-dark-40); opacity: .7; } From f702c0b8b61e94fa7c83eefe4024b62b9daeaa2a Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 09:41:33 +0100 Subject: [PATCH 0174/1831] Style the inline Alerts --- administrator/templates/atum/scss/blocks/_alerts.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/blocks/_alerts.scss b/administrator/templates/atum/scss/blocks/_alerts.scss index 992fd04c1dc55..52a41405c412d 100644 --- a/administrator/templates/atum/scss/blocks/_alerts.scss +++ b/administrator/templates/atum/scss/blocks/_alerts.scss @@ -3,7 +3,12 @@ .j-main-container { .alert { - margin: 10px; + margin: 1rem 0; + border:2px solid; + border-left:none; + border-right:none; + box-shadow: $atum-box-shadow; + background-color: rgba(255,255,255,0.8); } } From 8b161f85fb0ef53b6c7200e73f2909f493772a77 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 09:50:13 +0100 Subject: [PATCH 0175/1831] Change alert colors --- administrator/templates/atum/scss/_variables.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 6930fbe2b84cc..bd780c2cdce77 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -23,7 +23,7 @@ $indigo: #0377be; $purple: #6f42c1; $pink: #e83e8c; $red: #c52827; -$yellow: #b35900; +$yellow: #f27042; $green: #2f7d32; $teal: #20c997; $cyan: #108193; @@ -62,10 +62,10 @@ $theme-colors: map-merge(( ), $theme-colors); $colors: ( - success-border: darken(theme-color("success"), 5%), - info-border: darken(theme-color("info"), 7%), - warning-border: darken(theme-color("warning"), 5%), - danger-border: darken(theme-color("danger"), 5%), + success-border: theme-color("success"), + info-border: theme-color("info"), + warning-border: theme-color("warning"), + danger-border: theme-color("danger"), sidebar-link-color: #e3eaf1, sidebar-link-color-hover: var(--white), sidebar-child-link-color: #cbd6e2, From e5f38bd57038f25c4c99fa10d0b90c458e44e84b Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Thu, 21 Feb 2019 09:58:09 +0100 Subject: [PATCH 0176/1831] Update ItemsModel.php --- administrator/components/com_menus/Model/ItemsModel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_menus/Model/ItemsModel.php b/administrator/components/com_menus/Model/ItemsModel.php index e2a29c2ffde3e..94d875b0058cf 100644 --- a/administrator/components/com_menus/Model/ItemsModel.php +++ b/administrator/components/com_menus/Model/ItemsModel.php @@ -13,6 +13,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Form\Form; use Joomla\CMS\Language\Associations; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; @@ -498,7 +499,7 @@ protected function getListQuery() * @since 3.2 * @throws \Exception if there is an error in the form event. */ - protected function preprocessForm(\JForm $form, $data, $group = 'content') + protected function preprocessForm(Form $form, $data, $group = 'content') { $name = $form->getName(); From ca4507e0d758b6727c599d0c051005105edb30bc Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Thu, 21 Feb 2019 10:15:27 +0100 Subject: [PATCH 0177/1831] Change Alert Colors --- administrator/templates/atum/scss/_variables.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index bd780c2cdce77..195bd837067c1 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -23,7 +23,7 @@ $indigo: #0377be; $purple: #6f42c1; $pink: #e83e8c; $red: #c52827; -$yellow: #f27042; +$yellow: #d43900; $green: #2f7d32; $teal: #20c997; $cyan: #108193; @@ -104,6 +104,14 @@ $colors: ( // atum-bg-dark-90-hover: #rgba($color-80, 0.5), ); + +// Alerts + +$alert-border-level: 0; +$alert-color-level: 0; + + + // Global $atum-box-shadow: 0 1px 2px rgba($black, .25); $enable-rounded: false; From 9dfd78b0ec71ede8f951b93bfd95dae53c4ada41 Mon Sep 17 00:00:00 2001 From: chmst Date: Thu, 21 Feb 2019 10:16:22 +0100 Subject: [PATCH 0178/1831] fix warning static fuction --- .../modules/mod_quickicon/Helper/QuickIconHelper.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php index 5abbb6f7ae0fd..e253c8022f176 100644 --- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php @@ -214,7 +214,7 @@ public static function &getButtons(Registry $params, CMSApplication $application * * @since 4.0 */ - private function countModules() + private static function countModules() { $app = Factory::getApplication(); @@ -240,7 +240,7 @@ private function countModules() * * @since 4.0 */ - private function countArticles() + private static function countArticles() { $app = Factory::getApplication(); @@ -268,7 +268,7 @@ private function countArticles() * * @since 4.0 */ - private function countMenuItems() + private static function countMenuItems() { $app = Factory::getApplication(); @@ -296,7 +296,7 @@ private function countMenuItems() * * @since 4.0 */ - private function countUsers() + private static function countUsers() { $app = Factory::getApplication(); @@ -322,7 +322,7 @@ private function countUsers() * * @since 4.0 */ - private function countArticleCategories() + private static function countArticleCategories() { $app = Factory::getApplication(); @@ -349,7 +349,7 @@ private function countArticleCategories() * * @since 4.0 */ - private function countCheckin() + private static function countCheckin() { $app = Factory::getApplication(); From 0cbf01049c109d0f17dd7e03a0afbc85e48253c6 Mon Sep 17 00:00:00 2001 From: chmst Date: Thu, 21 Feb 2019 12:45:54 +0100 Subject: [PATCH 0179/1831] Improve Language String, add params show_config and show_articles --- .../language/en-GB/en-GB.mod_quickicon.ini | 6 ++- .../mod_quickicon/Helper/QuickIconHelper.php | 40 +++++++++++-------- .../modules/mod_quickicon/mod_quickicon.xml | 20 ++++++++++ .../atum/scss/blocks/_quickicons.scss | 2 +- layouts/joomla/quickicons/icon.php | 2 +- 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini index 02e0efd2eab6e..f46cf2f39878b 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini @@ -19,13 +19,15 @@ MOD_QUICKICON_INSTALL_EXTENSIONS="Install Extensions" MOD_QUICKICON_LANGUAGE_MANAGER="Languages" MOD_QUICKICON_MAINTENANCE="Maintenance" MOD_QUICKICON_MEDIA_MANAGER="Media" -MOD_QUICKICON_MENUITEMS_MANAGER="MenuItems" +MOD_QUICKICON_MENUITEMS_MANAGER="Menu Items" MOD_QUICKICON_MODULE_MANAGER="Modules" MOD_QUICKICON_NAV_LABEL="Quick Links" +MOD_QUICKICON_SHOW_ARTICLES_LABEL="Show Articles Icon" MOD_QUICKICON_SHOW_CATEGORIES_LABEL="Show Categories Icon" +MOD_QUICKICON_SHOW_GLOBAL_LABEL="Show Global Configuration Icon" MOD_QUICKICON_SHOW_CHECKINS_LABEL="Show Checkin Icon" MOD_QUICKICON_SHOW_MEDIA_LABEL="Show Media Icon" -MOD_QUICKICON_SHOW_MENUITEMS_LABEL="Show MenuItems Icon" +MOD_QUICKICON_SHOW_MENUITEMS_LABEL="Show Menu Items Icon" MOD_QUICKICON_SHOW_MODULES_LABEL="Show Modules Icon" MOD_QUICKICON_SHOW_USERS_LABEL="Show User Icon" MOD_QUICKICON_STRUCTURE="Structure" diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php index e253c8022f176..f5697ad39a6e5 100644 --- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php @@ -76,14 +76,17 @@ public static function &getButtons(Registry $params, CMSApplication $application // Load mod_quickicon language file in case this method is called before rendering the module $application->getLanguage()->load('mod_quickicon'); - self::$buttons[$key][] = - [ - 'link' => Route::_('index.php?option=com_config'), - 'image' => 'fa fa-cog', - 'text' => Text::_('MOD_QUICKICON_GLOBAL_CONFIGURATION'), - 'access' => array('core.manage', 'com_config', 'core.admin', 'com_config'), - 'group' => 'MOD_QUICKICON_CONFIGURATION', - ]; + if ($params->get('show_global', '1')) + { + self::$buttons[$key][] = + [ + 'link' => Route::_('index.php?option=com_config'), + 'image' => 'fa fa-cog', + 'text' => Text::_('MOD_QUICKICON_GLOBAL_CONFIGURATION'), + 'access' => array('core.manage', 'com_config', 'core.admin', 'com_config'), + 'group' => 'MOD_QUICKICON_CONFIGURATION', + ]; + } if ($params->get('show_users', '1')) { @@ -111,15 +114,18 @@ public static function &getButtons(Registry $params, CMSApplication $application ]; } - self::$buttons[$key][] = - [ - 'amount' => self::countArticles(), - 'link' => Route::_('index.php?option=com_content&task=article.add'), - 'name' => Text::_('MOD_QUICKICON_ARTICLE_MANAGER'), - 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), - 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), - 'group' => 'MOD_QUICKICON_CONTENT', - ]; + if ($params->get('show_articles', '1')) + { + self::$buttons[$key][] = + [ + 'amount' => self::countArticles(), + 'link' => Route::_('index.php?option=com_content&task=article.add'), + 'name' => Text::_('MOD_QUICKICON_ARTICLE_MANAGER'), + 'text' => Text::_('MOD_QUICKICON_ADD_NEW'), + 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), + 'group' => 'MOD_QUICKICON_CONTENT', + ]; + } if ($params->get('show_categories', '1')) { diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml index 370ef0d6b67b2..82916d6406466 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.xml +++ b/administrator/modules/mod_quickicon/mod_quickicon.xml @@ -30,6 +30,16 @@ description="MOD_QUICKICON_GROUP_DESC" default="mod_quickicon" /> + + + + JNO + + + + -
    +
    • From 58c43535d9a90a1b8b75a31b15556acd9b2e077c Mon Sep 17 00:00:00 2001 From: Franciska Perisa Date: Thu, 21 Feb 2019 15:59:25 +0100 Subject: [PATCH 0180/1831] add noscript warning --- administrator/templates/atum/error_full.php | 10 +++----- administrator/templates/atum/error_login.php | 27 +++++++++----------- administrator/templates/atum/index.php | 5 ++-- administrator/templates/atum/login.php | 14 +++++++--- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php index 664aed0aa6daf..429de8d31b5eb 100644 --- a/administrator/templates/atum/error_full.php +++ b/administrator/templates/atum/error_full.php @@ -32,13 +32,9 @@ $hiddenMenu = $app->input->get('hidemainmenu'); $joomlaLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo.svg'; -// Template params -$siteLogo = $this->params->get('siteLogo') - ? JUri::root() . $this->params->get('siteLogo') - : $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg'; -$smallLogo = $this->params->get('smallLogo') - ? JUri::root() . $this->params->get('smallLogo') - : $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; +// Logos (params are not available) +$siteLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg'; +$smallLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; // Enable assets $wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')); diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index 153f61140cc2c..732fd3741042e 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -23,21 +23,16 @@ HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('script', 'vendor/css-vars-ponyfill/css-vars-ponyfill.min.js', ['version' => 'auto', 'relative' => true]); -// Load template JS file -HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']); - // Load template CSS file HTMLHelper::_('stylesheet', 'bootstrap.min.css', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('stylesheet', 'font-awesome.min.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.min.css', - ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.min.css', ['version' => 'auto', 'relative' => true]); // Load custom CSS file HTMLHelper::_('stylesheet', 'user.css', ['version' => 'auto', 'relative' => true]); // Load specific language related CSS -HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', - ['version' => 'auto']); +HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']); // Detecting Active Variables $option = $app->input->getCmd('option', ''); @@ -45,7 +40,7 @@ $layout = $app->input->getCmd('layout', 'default'); $sitename = $app->get('sitename'); -// Template params +// Logos (params are not available) $siteLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg'; $loginLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg'; @@ -74,7 +69,15 @@ + + + + @@ -187,7 +195,6 @@