Merge branch 'master' of github.com:joomla/joomla-cms into menumod

joomla · Dec 15, 2011 · 441dd53 · 441dd53
2 parents e7c8928 + d3ab5a7
commit 441dd53
Show file tree

Hide file tree

Showing 9 changed files with 296 additions and 51 deletions.
diff --git a/administrator/templates/bluestork/css/template_rtl.css b/administrator/templates/bluestork/css/template_rtl.css
@@ -12,6 +12,10 @@ body{
 	direction: rtl;
 }
 
+h1, h2, h3 {
+	text-align: right;
+}
+
 #border-top span.logo {
 	float: left;
 	padding-left:15px;
@@ -244,12 +248,6 @@ div.col{
 	text-indent: 35px;
 }
 
-/* debug */
-#system-debug ol,
-#system-debug ul{
-	direction: ltr;
-}
-
 /* -- LOGIN STYLES ----------------------------- */
 
 #section-box{

diff --git a/administrator/templates/hathor/css/template_rtl.css b/administrator/templates/hathor/css/template_rtl.css
@@ -15,6 +15,10 @@ body {
 	direction: rtl;
 }
 
+h1, h2, h3 {
+	text-align: right;
+}
+
 /**
  * CSS Reset
  */

diff --git a/components/com_media/media.php b/components/com_media/media.php
@@ -29,10 +29,8 @@
 define('COM_MEDIA_BASEURL', JURI::root().'/'.$params->get('image_path', 'images'));
 
 $lang = JFactory::getLanguage();
-	$lang->load($option, JPATH_ADMINISTRATOR, null, false, false)
-||	$lang->load($option, JPATH_COMPONENT_ADMINISTRATOR, null, false, false)
-||	$lang->load($option, JPATH_ADMINISTRATOR, $lang->getDefault(), false, false)
-||	$lang->load($option, JPATH_COMPONENT_ADMINISTRATOR, $lang->getDefault(), false, false);
+	$lang->load('com_media', JPATH_ADMINISTRATOR, null, false, false)
+	||	$lang->load('com_media', JPATH_ADMINISTRATOR, $lang->getDefault(), false, false);
 
 // Load the admin HTML view
 require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/media.php';

diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -27,6 +27,12 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+15-Dec-2011 Christophe Demko
+ # [#27382] Add appropriatestyling to system debug plugin (Andrea Tarr)
+
+15-Dec-2011 Jean-Marie Simonet
+ # [#27393] undefined $option com_media
+
 14-Dec-2011 Jean-Marie Simonet
  # [#27383] PHP 5.3 Strict Mode complains about Strict Standards on some methods. Thanks Jean-Claude
 

diff --git a/media/system/css/system.css b/media/system/css/system.css
@@ -67,3 +67,249 @@
 	background-image: url(../images/notice-note.png);
 	border-color: #F0DC7E;
 }
+
+/* Common CSS for system debug */
+div#system-debug {
+	clear: both;
+}
+
+#system-debug {
+	background-color: #fff;
+	color: #000;
+	border: 1px dashed silver;
+	padding: 5px;
+	text-align: left;
+}
+
+#system-debug div.dbgHeader {
+	background-color: #ddd;
+	border: 1px solid #eee;
+	font-size: 16px;
+}
+
+#system-debug h3 {
+	margin: 0;
+}
+
+#system-debug a h3 {
+	background-color: #ddd;
+	color: #000;
+	font-size: 14px;
+	padding: 5px;
+	text-decoration: none;
+	margin: 0px;
+}
+
+#system-debug a:hover,
+#system-debug a:focus,
+#system-debug a:active,
+#system-debug a:link,
+#system-debug a:visited {
+	background-color: #ddd;
+	color: #000;
+	text-decoration:none;
+}
+
+#system-debug a:hover h3,
+#system-debug a:focus h3 {
+	background-color: #4d4d4d;
+	color: #ddd;
+	font-size: 14px;
+	cursor: pointer;
+	text-decoration:none;
+}
+
+#system-debug div.dbgContainer {
+	padding: 10px;
+}
+
+#system-debug span.dbgCommand {
+	color: blue;
+	font-weight: bold;
+}
+
+#system-debug span.dbgTable {
+	color: green;
+	font-weight: bold;
+}
+
+#system-debug b.dbgOperator {
+	color: red;
+	font-weight: bold;
+}
+
+#system-debug h1 {
+	background-color: #2c2c2c;
+	color: #fff;
+	padding: 10px;
+	margin: 0;
+	font-size: 16px;
+	line-height: 1em;
+}
+
+#system-debug h4 {
+	font-size: 14px;
+	font-weight:bold;
+	margin: 5px 0 0 0;
+}
+
+#system-debug h5 {
+	font-size: 13px;
+	font-weight:bold;
+	margin: 5px 0 0 0;
+}
+
+div#system-debug {
+	margin: 5px;
+}
+
+#system-debug ol {
+	margin-left: 25px;
+	margin-right: 25px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug ul {
+	list-style: none;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug li {
+	font-size: 13px;
+	margin-bottom: 10px;
+}
+
+#system-debug code {
+	font-size: 13px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug p {
+	font-size: 13px;
+}
+
+
+/* Common CSS for system debug */
+
+#system-debug {
+	background-color: #fff;
+	color: #000;
+	border: 1px dashed silver;
+	padding: 10px;
+}
+
+#system-debug div.dbgHeader {
+	background-color: #ddd;
+	border: 1px solid #eee;
+	font-size: 16px;
+}
+
+#system-debug h3 {
+	margin: 0;
+}
+
+#system-debug a h3 {
+	background-color: #ddd;
+	color: #000;
+	font-size: 14px;
+	padding: 5px;
+	text-decoration: none;
+	margin: 0px;
+}
+
+#system-debug .dbgerror a h3 {
+	background-color: red;
+}
+
+#system-debug a:hover,
+#system-debug a:focus,
+#system-debug a:active,
+#system-debug a:link,
+#system-debug a:visited {
+	background-color: #ddd;
+	color: #000;
+	text-decoration:none;
+}
+
+#system-debug a:hover h3,
+#system-debug a:focus h3 {
+	background-color: #4d4d4d;
+	color: #ddd;
+	font-size: 14px;
+	cursor: pointer;
+	text-decoration:none;
+}
+
+#system-debug div.dbgContainer {
+	padding: 10px;
+}
+
+#system-debug span.dbgCommand {
+	color: blue;
+	font-weight: bold;
+}
+
+#system-debug span.dbgTable {
+	color: green;
+	font-weight: bold;
+}
+
+#system-debug b.dbgOperator {
+	color: red;
+	font-weight: bold;
+}
+
+#system-debug h1 {
+	background-color: #2c2c2c;
+	color: #fff;
+	padding: 10px;
+	margin: 0;
+	font-size: 16px;
+	line-height: 1em;
+}
+
+#system-debug h4 {
+	font-size: 14px;
+	font-weight:bold;
+}
+
+#system-debug h5 {
+	font-size: 13px;
+	font-weight:bold;
+	margin-top: 5px;
+}
+
+div#system-debug {
+	margin: 5px;
+}
+
+#system-debug ol {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+#system-debug ul {
+	list-style: none;
+}
+
+#system-debug li {
+	font-size: 13px;
+	margin-bottom: 10px;
+}
+
+#system-debug code {
+	font-size: 13px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug p {
+	font-size: 13px;
+}
+
+#system-debug div.dbgHeader.dbgerror {
+	background-color: red;
+}