From be18973a3cc9fae6c943ce0993b91cf81e95c965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Tue, 10 Apr 2012 10:17:49 +0200 Subject: [PATCH] # [#28287] Fix some differences between platform and cms. Backport CSS changes. Thanks Rouven --- installation/CHANGELOG | 4 + libraries/joomla/access/rule.php | 16 ++ libraries/joomla/access/rules.php | 16 ++ libraries/joomla/application/cli/daemon.php | 2 +- .../application/component/controller.php | 1 + libraries/joomla/database/exception.php | 1 + libraries/joomla/log/logexception.php | 1 + libraries/phpmailer/phpmailer.php | 1 + libraries/phpmailer/pop3.php | 1 + libraries/phpmailer/smtp.php | 1 + libraries/phputf8/mbstring/core.php | 1 + libraries/phputf8/native/core.php | 1 + libraries/phputf8/ord.php | 1 + libraries/phputf8/str_ireplace.php | 1 + libraries/phputf8/str_pad.php | 1 + libraries/phputf8/str_split.php | 1 + libraries/phputf8/strcasecmp.php | 1 + libraries/phputf8/strcspn.php | 1 + libraries/phputf8/stristr.php | 1 + libraries/phputf8/strrev.php | 1 + libraries/phputf8/strspn.php | 1 + libraries/phputf8/substr_replace.php | 1 + libraries/phputf8/trim.php | 1 + libraries/phputf8/ucfirst.php | 1 + libraries/phputf8/ucwords.php | 1 + libraries/phputf8/utils/ascii.php | 1 + libraries/phputf8/utils/bad.php | 1 + libraries/phputf8/utils/patterns.php | 1 + libraries/phputf8/utils/position.php | 1 + libraries/phputf8/utils/specials.php | 1 + libraries/phputf8/utils/unicode.php | 1 + libraries/phputf8/utils/validation.php | 1 + media/system/css/adminlist.css | 28 +-- media/system/css/calendar-jos.css | 176 +++++++++--------- media/system/css/system.css | 2 +- 35 files changed, 170 insertions(+), 102 deletions(-) diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 5189f3b424193..4556e1b0bf21b 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -26,6 +26,10 @@ $ -> Language fix or change - -> Removed ! -> Note +10-Apr-2012 Jean-Marie Simonet + # [#28287] Fix some differences between platform and cms. Backport CSS changes. Thanks Rouven + + 09-Apr-2012 Christophe Demko # [ #24839] Incorrect tooltip for Sticky column icons in Banner Manager: Banners - [#28360] Get rid of assign() and assignRefs() uses in view: Installation (Rouven Weßling) diff --git a/libraries/joomla/access/rule.php b/libraries/joomla/access/rule.php index f31462dd855d4..cf7ac7e7663e8 100644 --- a/libraries/joomla/access/rule.php +++ b/libraries/joomla/access/rule.php @@ -185,4 +185,20 @@ public function __toString() */ class JRule extends JAccessRule { + /** + * Constructor. + * + * The input array must be in the form: array(-42 => true, 3 => true, 4 => false) + * or an equivalent JSON encoded string. + * + * @param mixed $identities A JSON format string (probably from the database) or a named array. + * + * @since 11.1 + * @deprecated 12.3 + */ + public function __construct($identities) + { + JLog::add('JRule is deprecated. Use JAccessRule instead.', JLog::WARNING, 'deprecated'); + parent::__construct($identities); + } } diff --git a/libraries/joomla/access/rules.php b/libraries/joomla/access/rules.php index acd039a8dc859..0d8cb104e85aa 100644 --- a/libraries/joomla/access/rules.php +++ b/libraries/joomla/access/rules.php @@ -228,4 +228,20 @@ public function __toString() */ class JRules extends JAccessRules { + /** + * Constructor. + * + * The input array must be in the form: array('action' => array(-42 => true, 3 => true, 4 => false)) + * or an equivalent JSON encoded string, or an object where properties are arrays. + * + * @param mixed $input A JSON format string (probably from the database) or a nested array. + * + * @since 11.1 + * @deprecated 12.3 + */ + public function __construct($input = '') + { + JLog::add('JRules is deprecated. Use JAccessRules instead.', JLog::WARNING, 'deprecated'); + parent::__construct($input); + } } diff --git a/libraries/joomla/application/cli/daemon.php b/libraries/joomla/application/cli/daemon.php index 15bd16f2098fd..1ed90c3178a8c 100644 --- a/libraries/joomla/application/cli/daemon.php +++ b/libraries/joomla/application/cli/daemon.php @@ -21,4 +21,4 @@ class JDaemon extends JApplicationDaemon { -} \ No newline at end of file +} diff --git a/libraries/joomla/application/component/controller.php b/libraries/joomla/application/component/controller.php index 15b5e2bb0f6ed..eb38adc27bdc6 100644 --- a/libraries/joomla/application/component/controller.php +++ b/libraries/joomla/application/component/controller.php @@ -505,6 +505,7 @@ public function authorize($task) * @return boolean True if authorised * * @since 11.1 + * @deprecated 12.3 */ public function authorise($task) { diff --git a/libraries/joomla/database/exception.php b/libraries/joomla/database/exception.php index b5e4ecdb9d5ff..b9bd35c8c6e8d 100644 --- a/libraries/joomla/database/exception.php +++ b/libraries/joomla/database/exception.php @@ -15,6 +15,7 @@ * @package Joomla.Platform * @subpackage Database * @since 11.1 + * @deprecated 12.3 Use semantic exceptions instead */ class JDatabaseException extends Exception { diff --git a/libraries/joomla/log/logexception.php b/libraries/joomla/log/logexception.php index 1561afae2f4a7..6154df3a125fa 100644 --- a/libraries/joomla/log/logexception.php +++ b/libraries/joomla/log/logexception.php @@ -15,6 +15,7 @@ * @package Joomla.Platform * @subpackage Log * @since 11.1 + * @deprecated 12.3 Use semantic exceptions instead */ class LogException extends Exception { diff --git a/libraries/phpmailer/phpmailer.php b/libraries/phpmailer/phpmailer.php index fc2109df00375..0f36173dc2e71 100644 --- a/libraries/phpmailer/phpmailer.php +++ b/libraries/phpmailer/phpmailer.php @@ -31,6 +31,7 @@ * @author Jim Jagielski * @copyright 2010 - 2011 Jim Jagielski * @copyright 2004 - 2009 Andy Prevost + * @version $Id: class.phpmailer.php 450 2010-06-23 16:46:33Z coolbru $ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/libraries/phpmailer/pop3.php b/libraries/phpmailer/pop3.php index cee4fb778d422..2ab71e5ade95c 100644 --- a/libraries/phpmailer/pop3.php +++ b/libraries/phpmailer/pop3.php @@ -32,6 +32,7 @@ * @copyright 2010 - 2011 Jim Jagielski * @copyright 2004 - 2009 Andy Prevost * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL) + * @version $Id: class.pop3.php 450 2010-06-23 16:46:33Z coolbru $ */ /** diff --git a/libraries/phpmailer/smtp.php b/libraries/phpmailer/smtp.php index ee86f0a5fb099..cd60245dbc3f9 100644 --- a/libraries/phpmailer/smtp.php +++ b/libraries/phpmailer/smtp.php @@ -32,6 +32,7 @@ * @author Jim Jagielski * @copyright 2010 - 2011 Jim Jagielski * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL) + * @version $Id: class.smtp.php 450 2010-06-23 16:46:33Z coolbru $ */ /** diff --git a/libraries/phputf8/mbstring/core.php b/libraries/phputf8/mbstring/core.php index 8b5de9673f225..5c87bc87508e4 100644 --- a/libraries/phputf8/mbstring/core.php +++ b/libraries/phputf8/mbstring/core.php @@ -1,5 +1,6 @@ ", ">>" buttons have this class */ - text-align: center; /* They are the navigation buttons */ - padding: 2px; /* Make the buttons seem like they're pressing */ + text-align: center; /* They are the navigation buttons */ + padding: 2px; /* Make the buttons seem like they're pressing */ } .calendar thead .title { /* This holds the current "month, year" */ - font-weight: bold; /* Pressing it will take you to the current date */ - text-align: center; - background: #333333; - color: #ffffff; - padding: 2px; + font-weight: bold; /* Pressing it will take you to the current date */ + text-align: center; + background: #333333; + color: #ffffff; + padding: 2px; } .calendar thead .headrow { /* Row containing navigation buttons */ - background: #dedede; - color: #000; + background: #dedede; + color: #000; } .calendar thead .name { /* Cells containing the day names */ - border-bottom: 1px solid #cccccc; - padding: 2px; - text-align: center; - color: #000; + border-bottom: 1px solid #cccccc; + padding: 2px; + text-align: center; + color: #000; } .calendar thead .weekend { /* How a weekend day name shows in header */ - color: #999; + color: #999; } .calendar thead .hilite { /* How do the buttons in header appear when hover */ - background: #bbbbbb; - color: #000000; - border: 1px solid #cccccc; - padding: 1px; + background: #bbbbbb; + color: #000000; + border: 1px solid #cccccc; + padding: 1px; } .calendar thead .active { /* Active (pressed) buttons in header */ - background: #c77; - padding: 2px 0px 0px 2px; + background: #c77; + padding: 2px 0px 0px 2px; } .calendar thead .daynames { /* Row containing the day names */ - background: #dddddd; + background: #dddddd; } /* The body part -- contains all the days in month. */ .calendar tbody .day { /* Cells containing month days dates */ - width: 2em; - text-align: right; - padding: 2px 4px 2px 2px; + width: 2em; + text-align: right; + padding: 2px 4px 2px 2px; } .calendar table .wn { - padding: 2px 3px 2px 2px; - border-right: 1px solid #cccccc; - background: #dddddd; + padding: 2px 3px 2px 2px; + border-right: 1px solid #cccccc; + background: #dddddd; } .calendar tbody .rowhilite td { - background: #666666; - color: #ffffff; + background: #666666; + color: #ffffff; } .calendar tbody .rowhilite td.wn { - background: #666666; - color: #ffffff; + background: #666666; + color: #ffffff; } .calendar tbody td.active { /* Active (pressed) cells */ - background: #000000; - color: #ffffff; - padding: 2px 2px 0px 2px; + background: #000000; + color: #ffffff; + padding: 2px 2px 0px 2px; } .calendar tbody td.weekend { /* Cells showing weekend days */ - color: #999; + color: #999; } .calendar tbody td.selected { /* Cell showing today date */ - font-weight: bold; - border: 1px solid #000; - padding: 1px 3px 1px 1px; - background: #000000; - color: #ffffff; + font-weight: bold; + border: 1px solid #000; + padding: 1px 3px 1px 1px; + background: #000000; + color: #ffffff; } .calendar tbody td.hilite { /* Hovered cells */ - background: #999999; - padding: 1px 3px 1px 1px; - border: 1px solid #666666; - color: #ffffff; + background: #999999; + padding: 1px 3px 1px 1px; + border: 1px solid #666666; + color: #ffffff; } -.calendar tbody td.today { font-weight: bold; } +.calendar tbody td.today { + font-weight: bold; +} -.calendar tbody .disabled { color: #999; } +.calendar tbody .disabled { + color: #999; +} .calendar tbody .emptycell { /* Empty cells (the best is to hide them) */ - visibility: hidden; + visibility: hidden; } .calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */ - display: none; + display: none; } /* The footer part -- status bar and "Close" button */ .calendar tfoot .footrow { /* The in footer (only one right now) */ - text-align: center; - background: #cccccc; - color: #000; + text-align: center; + background: #cccccc; + color: #000; } .calendar tfoot .ttip { /* Tooltip (status bar) cell */ - border-top: 1px solid #cccccc; - background: #efefef; - color: #000000; + border-top: 1px solid #cccccc; + background: #efefef; + color: #000000; } .calendar tfoot .hilite { /* Hover style for buttons in footer */ - background: #666666; - border: 1px solid #f40; - padding: 1px; + background: #666666; + border: 1px solid #f40; + padding: 1px; } .calendar tfoot .active { /* Active (pressed) style for buttons in footer */ - background: #999999; - padding: 2px 0px 0px 2px; + background: #999999; + padding: 2px 0px 0px 2px; } /* Combo boxes (menus that display months/years for direct selection) */ .combo { - position: absolute; - display: none; - top: 0px; - left: 0px; - width: 4em; - cursor: default; - border: 1px solid #655; - background: #ffffff; - color: #000; - font-size: smaller; + position: absolute; + display: none; + top: 0px; + left: 0px; + width: 4em; + cursor: default; + border: 1px solid #655; + background: #ffffff; + color: #000; + font-size: smaller; } .combo .label { - width: 100%; - text-align: center; + width: 100%; + text-align: center; } .combo .hilite { - background: #fc8; + background: #fc8; } .combo .active { - border-top: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; - background: #efefef; - font-weight: bold; -} \ No newline at end of file + border-top: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; + background: #efefef; + font-weight: bold; +} diff --git a/media/system/css/system.css b/media/system/css/system.css index 1477699dba2d2..87b985b8b742e 100644 --- a/media/system/css/system.css +++ b/media/system/css/system.css @@ -32,7 +32,7 @@ } #system-message > dd > ul > li { - line-height: 1.5em + line-height: 1.5em; } /* System Standard Messages */