Skip to content

Commit

Permalink
# [joomla#28287] Fix some differences between platform and cms. Back…
Browse files Browse the repository at this point in the history
…port CSS

changes. Thanks Rouven
  • Loading branch information
realityking authored and infograf768 committed Apr 10, 2012
1 parent 73d5562 commit be18973
Show file tree
Hide file tree
Showing 35 changed files with 170 additions and 102 deletions.
4 changes: 4 additions & 0 deletions installation/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 16 additions & 0 deletions libraries/joomla/access/rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
16 changes: 16 additions & 0 deletions libraries/joomla/access/rules.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion libraries/joomla/application/cli/daemon.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
class JDaemon extends JApplicationDaemon
{

}
}
1 change: 1 addition & 0 deletions libraries/joomla/application/component/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ public function authorize($task)
* @return boolean True if authorised
*
* @since 11.1
* @deprecated 12.3
*/
public function authorise($task)
{
Expand Down
1 change: 1 addition & 0 deletions libraries/joomla/database/exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* @package Joomla.Platform
* @subpackage Database
* @since 11.1
* @deprecated 12.3 Use semantic exceptions instead
*/
class JDatabaseException extends Exception
{
Expand Down
1 change: 1 addition & 0 deletions libraries/joomla/log/logexception.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* @package Joomla.Platform
* @subpackage Log
* @since 11.1
* @deprecated 12.3 Use semantic exceptions instead
*/
class LogException extends Exception
{
Expand Down
1 change: 1 addition & 0 deletions libraries/phpmailer/phpmailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
1 change: 1 addition & 0 deletions libraries/phpmailer/pop3.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 $
*/

/**
Expand Down
1 change: 1 addition & 0 deletions libraries/phpmailer/smtp.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 $
*/

/**
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/mbstring/core.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/native/core.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/ord.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/str_ireplace.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/str_pad.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/str_split.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/strcasecmp.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/strcspn.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/stristr.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/strrev.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/strspn.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/substr_replace.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/trim.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/ucfirst.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/ucwords.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* @package utf8
* @subpackage strings
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/ascii.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
/**
* Tools to help with ASCII in UTF-8
* @version $Id$
* @package utf8
* @subpackage ascii
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/bad.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* Tools for locating / replacing bad bytes in UTF-8 strings
* The Original Code is Mozilla Communicator client code.
* The Initial Developer of the Original Code is
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/patterns.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* PCRE Regular expressions for UTF-8. Note this file is not actually used by
* the rest of the library but these regular expressions can be useful to have
* available.
* @version $Id$
* @see http://www.w3.org/International/questions/qa-forms-utf-8
* @package utf8
* @subpackage patterns
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/position.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
/**
* Locate a byte index given a UTF-8 character index
* @version $Id$
* @package utf8
* @subpackage position
*/
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/specials.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* be regarded as a non-word character, like ASCII control characters and punctuation. This has a "Roman"
* bias - it would be unaware of modern Chinese "punctuation" characters for example.
* Note: requires utils/unicode.php to be loaded
* @version $Id$
* @package utf8
* @subpackage utils
* @see utf8_is_valid
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/unicode.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* Tools for conversion between UTF-8 and unicode
* The Original Code is Mozilla Communicator client code.
* The Initial Developer of the Original Code is
Expand Down
1 change: 1 addition & 0 deletions libraries/phputf8/utils/validation.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
* @version $Id$
* Tools for validing a UTF-8 string is well formed.
* The Original Code is Mozilla Communicator client code.
* The Initial Developer of the Original Code is
Expand Down
28 changes: 14 additions & 14 deletions media/system/css/adminlist.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ table.adminlist {
border-spacing: 1px;
background-color: #f3f3f3;
color: #666;
font-size: 11px
font-size: 11px;
}

table.adminlist td,
table.adminlist th {
padding: 4px !important;
font-size: 11px
font-size: 11px;
}

table.adminlist thead th {
Expand Down Expand Up @@ -62,7 +62,7 @@ table.adminlist tbody tr {
}

table.adminlist tbody tr.row0:hover td,
table.adminlist tbody tr.row1:hover td {
table.adminlist tbody tr.row1:hover td {
background-color: #e8f6fe;
}

Expand Down Expand Up @@ -136,7 +136,7 @@ fieldset li,
ol#property-values li {
list-style: none;
margin: 0;
padding: 5px
padding: 5px;
}

fieldset.filter {
Expand All @@ -149,7 +149,7 @@ fieldset.filter ol {
border: 0;
list-style: none;
margin: 0;
padding: 5px 0 0
padding: 5px 0 0;
}

fieldset.filter ol li {
Expand All @@ -167,7 +167,7 @@ fieldset.filter .left {
float: left;
width: auto;
margin: 0;
text-align: left
text-align: left;
}

fieldset.filter .left label {
Expand Down Expand Up @@ -221,7 +221,7 @@ fieldset button {
float: left;
width: auto;
margin: 5px 5px 5px 0;
font-size:11px !important
font-size: 11px !important;
}

.list-footer div.limit {
Expand All @@ -237,9 +237,9 @@ fieldset button {
/* ++++++++++++++ pagination ++++++++++++++ */

.list-footer {
margin: 10px 0 ;
margin: 10px 0;
padding: 10px 0 10px 0;
text-align: center
text-align: center;
}

table .list-footer ul {
Expand All @@ -248,7 +248,7 @@ table .list-footer ul {
padding: 0;
text-align: left;
border: solid 0 #ccc;
float: left
float: left;
}

.list-footer li {
Expand All @@ -257,14 +257,14 @@ table .list-footer ul {
text-align: left;
border: solid 0 #eee;
margin: 0 2px;
font-size: 11px
font-size: 11px;
}

.list-footer li.pagination-start,
.list-footer li.pagination-next,
.list-footer li.pagination-end,
.list-footer li.pagination-prev {
border: 0;
border: 0;
}

.list-footer li.pagination-start ,
Expand All @@ -273,5 +273,5 @@ table .list-footer ul {
}

p.counter {
font-weight:bold;
}
font-weight: bold;
}
Loading

0 comments on commit be18973

Please sign in to comment.