diff --git a/administrator/components/com_checkin/src/Model/CheckinModel.php b/administrator/components/com_checkin/src/Model/CheckinModel.php index 3064f964f3134..cb16bc30527c5 100644 --- a/administrator/components/com_checkin/src/Model/CheckinModel.php +++ b/administrator/components/com_checkin/src/Model/CheckinModel.php @@ -107,26 +107,31 @@ public function checkin($ids = array()) continue; } + $query = $db->getQuery(true) + ->update($db->quoteName($tn)) + ->set($db->quoteName('checked_out') . ' = DEFAULT'); + if ($fields['checked_out_time']->Null === 'YES') { - $query = $db->getQuery(true) - ->update($db->quoteName($tn)) - ->set($db->quoteName('checked_out') . ' = DEFAULT') - ->set($db->quoteName('checked_out_time') . ' = NULL') - ->where($db->quoteName('checked_out') . ' > 0'); + $query->set($db->quoteName('checked_out_time') . ' = NULL'); } else { $nullDate = $db->getNullDate(); - $query = $db->getQuery(true) - ->update($db->quoteName($tn)) - ->set($db->quoteName('checked_out') . ' = DEFAULT') - ->set($db->quoteName('checked_out_time') . ' = :checkouttime') - ->where($db->quoteName('checked_out') . ' > 0') + $query->set($db->quoteName('checked_out_time') . ' = :checkouttime') ->bind(':checkouttime', $nullDate); } + if ($fields['checked_out']->Null === 'YES') + { + $query->where($db->quoteName('checked_out') . ' IS NOT NULL'); + } + else + { + $query->where($db->quoteName('checked_out') . ' > 0'); + } + $db->setQuery($query); if ($db->execute()) @@ -169,56 +174,50 @@ public function getItems() { $db = $this->getDbo(); $tables = $db->getTableList(); + $prefix = Factory::getApplication()->get('dbprefix'); // This array will hold table name as key and checked in item count as value. $results = array(); - foreach ($tables as $i => $tn) + foreach ($tables as $tn) { // Make sure we get the right tables based on prefix. - if (stripos($tn, Factory::getApplication()->get('dbprefix')) !== 0) + if (stripos($tn, $prefix) !== 0) { - unset($tables[$i]); continue; } if ($this->getState('filter.search') && stripos($tn, $this->getState('filter.search')) === false) { - unset($tables[$i]); continue; } - $fields = $db->getTableColumns($tn); + $fields = $db->getTableColumns($tn, false); if (!(isset($fields['checked_out']) && isset($fields['checked_out_time']))) { - unset($tables[$i]); continue; } - } - foreach ($tables as $tn) - { $query = $db->getQuery(true) ->select('COUNT(*)') - ->from($db->quoteName($tn)) - ->where('checked_out > 0'); - - $db->setQuery($query); + ->from($db->quoteName($tn)); - if ($db->execute()) + if ($fields['checked_out']->Null === 'YES') { - $results[$tn] = $db->loadResult(); - - // Show only tables with items to checkin. - if ((int) $results[$tn] === 0) - { - unset($results[$tn]); - } + $query->where($db->quoteName('checked_out') . ' IS NOT NULL'); } else { - continue; + $query->where($db->quoteName('checked_out') . ' > 0'); + } + + $db->setQuery($query); + $count = $db->loadResult(); + + if ($count) + { + $results[$tn] = $count; } } diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css index a72300892439f..fd6350a6cc15a 100644 --- a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css +++ b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css @@ -49,9 +49,10 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before, div.phpdebugbar-widgets-sqlqueries a.phpdebugbar-widgets-editor-link:before { - font-family:"Font Awesome 5 Free"; + font-family: "Font Awesome 5 Free"; margin-right: 4px; font-size: 12px; + font-weight: 900; } div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before { diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php index 3107b2194a23d..fc852b0cc7d2e 100644 --- a/components/com_config/tmpl/config/default.php +++ b/components/com_config/tmpl/config/default.php @@ -34,19 +34,9 @@
-
-
-
- loadTemplate('site'); ?> -
-
- loadTemplate('seo'); ?> -
-
- loadTemplate('metadata'); ?> -
-
-
+ loadTemplate('site'); ?> + loadTemplate('seo'); ?> + loadTemplate('metadata'); ?> diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php index 4124c0b728126..697f1338bba4f 100644 --- a/components/com_users/tmpl/profile/edit.php +++ b/components/com_users/tmpl/profile/edit.php @@ -55,19 +55,7 @@ - - hidden) : ?> - input; ?> - -
-
- label; ?> -
-
- input; ?> -
-
- + renderField(); ?> diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php index dcc2a18ebe467..eb1fed204c567 100644 --- a/libraries/src/Component/Router/Rules/MenuRules.php +++ b/libraries/src/Component/Router/Rules/MenuRules.php @@ -272,7 +272,7 @@ protected function buildLookup($language = '*') } /** - * Dummy method to fulfill the interface requirements + * Dummy method to fulfil the interface requirements * * @param array &$segments The URL segments to parse * @param array &$vars The vars that result from the segments @@ -287,7 +287,7 @@ public function parse(&$segments, &$vars) } /** - * Dummy method to fulfill the interface requirements + * Dummy method to fulfil the interface requirements * * @param array &$query The vars that should be converted * @param array &$segments The URL segments to create diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php index eebffac7846b3..cdd5b5400ae7b 100644 --- a/libraries/src/Component/Router/Rules/NomenuRules.php +++ b/libraries/src/Component/Router/Rules/NomenuRules.php @@ -40,7 +40,7 @@ public function __construct(RouterView $router) } /** - * Dummy method to fulfill the interface requirements + * Dummy method to fulfil the interface requirements * * @param array &$query The query array to process * diff --git a/libraries/src/Component/Router/Rules/StandardRules.php b/libraries/src/Component/Router/Rules/StandardRules.php index 903db50d9141f..01c2c1989fa70 100644 --- a/libraries/src/Component/Router/Rules/StandardRules.php +++ b/libraries/src/Component/Router/Rules/StandardRules.php @@ -40,7 +40,7 @@ public function __construct(RouterView $router) } /** - * Dummy method to fulfill the interface requirements + * Dummy method to fulfil the interface requirements * * @param array &$query The query array to process * diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php index b2956724f0b75..ee25794039517 100644 --- a/templates/cassiopeia/error.php +++ b/templates/cassiopeia/error.php @@ -110,7 +110,7 @@ countModules('top-a')) : ?>
- +
@@ -182,7 +182,7 @@ countModules('bottom-a')) : ?>
- +
diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php deleted file mode 100644 index a374b1cbbf66c..0000000000000 --- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php +++ /dev/null @@ -1,54 +0,0 @@ -content === null || $module->content === '') -{ - return; -} - -$moduleTag = $params->get('module_tag', 'div'); -$moduleAttribs = []; -$moduleAttribs['class'] = $module->position . ' card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8'); -$headerTag = htmlspecialchars($params->get('header_tag', 'h4'), ENT_QUOTES, 'UTF-8'); -$headerClass = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8'); -$headerAttribs = []; -$headerAttribs['class'] = $headerClass; - -if ($module->showtitle) : - $moduleAttribs['aria-labelledby'] = 'mod-' . $module->id; - $headerAttribs['id'] = 'mod-' . $module->id; - - if ($headerClass !== 'card-title') : - $headerAttribs['class'] .= 'card-header ' . $headerClass; - endif; -else: - $moduleAttribs['aria-label'] = $module->title; -endif; - -$header = '<' . $headerTag . ' ' . ArrayHelper::toString($headerAttribs) . '>' . $module->title . ''; -?> -< > - showtitle && $headerClass !== 'card-title') : ?> - - -
- showtitle && $headerClass === 'card-title') : ?> - - - content; ?> -
-> diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php index 6723617cfc902..59376c9c7ee87 100644 --- a/templates/cassiopeia/index.php +++ b/templates/cassiopeia/index.php @@ -129,7 +129,7 @@ countModules('top-a')) : ?>
- +
@@ -146,13 +146,13 @@
- +
- +
countModules('sidebar-right')) : ?> @@ -163,7 +163,7 @@ countModules('bottom-a')) : ?>
- +
diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss index 310f22d274560..896fb521bf09b 100644 --- a/templates/cassiopeia/scss/template.scss +++ b/templates/cassiopeia/scss/template.scss @@ -43,7 +43,6 @@ // Vendor overrides @import "vendor/awesomplete"; @import "vendor/bootstrap/buttons"; -@import "vendor/bootstrap/card"; @import "vendor/bootstrap/custom-forms"; @import "vendor/bootstrap/collapse"; @import "vendor/bootstrap/dropdown"; diff --git a/templates/cassiopeia/scss/vendor/bootstrap/_card.scss b/templates/cassiopeia/scss/vendor/bootstrap/_card.scss deleted file mode 100644 index f614511da2417..0000000000000 --- a/templates/cassiopeia/scss/vendor/bootstrap/_card.scss +++ /dev/null @@ -1,9 +0,0 @@ -// Alerts - -.card-grey { - background-color: #f7f7f9; -} - -.card-inverse { - color: rgba(255, 255, 255, .9); -}