Merge remote branch 'origin/master' into sitemap

7 files changed, 203 insertions, 43 deletions

diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php
index cebbf090a..44926c035 100644
--- a/lib/plugins/plugin/classes/ap_info.class.php
+++ b/lib/plugins/plugin/classes/ap_info.class.php
@@ -15,7 +15,7 @@ class ap_info extends ap_manage {
 
 
         foreach ($component_list as $component) {
-            if ($obj = & plugin_load($component['type'],$component['name'],false,true) === NULL) continue;
+            if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === NULL) continue;
 
             $compname = explode('_',$component['name']);
             if($compname[1]){
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index eb5348672..656b4762b 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -120,6 +120,7 @@ class ap_manage {
         @touch(reset($config_cascade['main']['local']));
 
         // update latest plugin date - FIXME
+        global $ID;
         send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true));
     }
 
diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php
index f906bf6aa..65050b896 100644
--- a/lib/plugins/plugin/lang/de-informal/lang.php
+++ b/lib/plugins/plugin/lang/de-informal/lang.php
@@ -5,6 +5,7 @@
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
+ * @author Matthias Schulte <post@lupo49.de>
  */
 $lang['menu']                  = 'Plugins verwalten';
 $lang['download']              = 'Herunterladen und installieren einer neuen Erweiterung';
diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php
index a9ee3d206..a70bea30c 100644
--- a/lib/plugins/plugin/lang/eo/lang.php
+++ b/lib/plugins/plugin/lang/eo/lang.php
@@ -10,6 +10,7 @@
  * @author Erik Pedersen <erik pedersen@shaw.ca>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Robert Bogenschneider <robog@GMX.de>
+ * @author Robert BOGENSCHNEIDER <robog@gmx.de>
  */
 $lang['menu']                  = 'Administri Kromaĵojn';
 $lang['download']              = 'Elŝuti kaj instali novan kromaĵon';
diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php
index 57052706e..28955004f 100644
--- a/lib/plugins/plugin/lang/pt-br/lang.php
+++ b/lib/plugins/plugin/lang/pt-br/lang.php
@@ -14,6 +14,7 @@
  * @author Jair Henrique <jair.henrique@gmail.com>
  * @author Luis Dantas <luisdantas@gmail.com>
  * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho <masiero@masiero.org>
  */
 $lang['menu']                  = 'Gerenciar Plug-ins';
 $lang['download']              = 'Baixar e instalar um novo plug-in';
diff --git a/lib/plugins/plugin/rtl.css b/lib/plugins/plugin/rtl.css
new file mode 100644
index 000000000..6ababd8e0
--- /dev/null
+++ b/lib/plugins/plugin/rtl.css
@@ -0,0 +1,51 @@
+
+#plugin__manager .pm_menu,
+#plugin__manager .pm_info,
+#plugin__manager p,
+#plugin__manager label {
+    text-align: right;
+}
+
+#plugin__manager .pm_menu {
+    float: right;
+}
+
+#plugin__manager .pm_info {
+    float: left;
+}
+
+#plugin__manager .pm_info dt {
+    float: right;
+    clear: right;
+}
+
+#plugin__manager .pm_info dd {
+    margin: 0 7em 0 0;
+}
+
+#plugin__manager .common fieldset {
+    text-align: right;
+}
+
+
+#plugin__manager .plugins .legend {
+    text-align: right;
+    float: right;
+}
+
+#plugin__manager .plugins .enable {
+    float: right;
+    margin-right: 0;
+    margin-left: 0.5em;
+}
+
+#plugin__manager .plugins .button {
+    float: left;
+    margin-right: 0.5em;
+}
+
+
+#plugin__manager .plugins fieldset.buttons .button {
+    float: right;
+}
+
diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css
index b37443e8d..de6cca579 100644
--- a/lib/plugins/plugin/style.css
+++ b/lib/plugins/plugin/style.css
@@ -5,47 +5,152 @@
  * @link    http://wiki.jalakai.co.uk/dokuwiki/doku.php/tutorials/adminplugin
  */
 
-/* overall containing div */
-#plugin__manager {}
-
-#plugin__manager h2 { margin-left: 0;}
-#plugin__manager form { display: block; margin: 0; padding: 0;}
-#plugin__manager legend { display: none;}
-#plugin__manager fieldset { width: auto;}
-#plugin__manager .button { margin: 0;}
-#plugin__manager p, #plugin__manager label { text-align: left;}
-#plugin__manager .hidden { display: none;}
-#plugin__manager .new { background: #dee7ec;}
-#plugin__manager input[disabled] { color: #ccc; border-color: #ccc;}  /* IE won't understand but doesn't require it */
-
-#plugin__manager .pm_menu, #plugin__manager .pm_info { margin-left: 0; text-align: left; }
-#plugin__manager .pm_menu { float: left; width: 48%; }
-#plugin__manager .pm_info { float: right; width: 50%; }
-
-#plugin__manager .common { }
-#plugin__manager .common form { }
-#plugin__manager .common fieldset { margin: 0; padding: 0 0 1.0em 0; text-align: left; border: none;}
-#plugin__manager .common label { padding: 0 0 0.5em 0;}
-#plugin__manager .common input {  }
-#plugin__manager .common input.edit { width: 24em; margin: 0.5em;}
-#plugin__manager .common .button { }
-
-#plugin__manager form.plugins { }
-#plugin__manager .plugins fieldset { color: #000; background: #fff; text-align: right; border-top: none; border-right: none; border-left: none;}
-#plugin__manager .plugins fieldset.protected { background: #fdd; color: #000; }
-#plugin__manager .plugins fieldset.disabled { background: #e0e0e0; color: #a8a8a8; }
-
-#plugin__manager .plugins .legend { color: #000; background: inherit; display: block; margin: 0; padding: 0; font-size: 1em; line-height: 1.4em; font-weight: normal; text-align: left; float: left; padding: 0; clear: none;}
-#plugin__manager .plugins .button { font-size: 95%;}
-
-#plugin__manager .plugins fieldset.buttons { border: none;}
-#plugin__manager .plugins fieldset.buttons .button { float: left; }
-
-#plugin__manager .pm_info h3 { margin-left: 0; }
-#plugin__manager .pm_info dl { margin: 1em 0; padding: 0; }
-#plugin__manager .pm_info dt { width: 6em; float: left; clear: left; margin: 0; padding: 0; }
-#plugin__manager .pm_info dd { margin: 0 0 0 7em; padding: 0; background: none; }
-
-#plugin__manager .plugins .enable { float: left; width: auto; margin-right: 0.5em;}
+#plugin__manager h2 {
+    margin-left: 0;
+}
+
+#plugin__manager form {
+    display: block;
+    margin: 0;
+    padding: 0;
+}
+
+#plugin__manager legend {
+    display: none;
+}
+
+#plugin__manager fieldset {
+    width: auto;
+}
+
+#plugin__manager .button {
+    margin: 0;
+}
+
+#plugin__manager p,
+#plugin__manager label {
+    text-align: left;
+}
+
+#plugin__manager .hidden {
+    display: none;
+}
+
+#plugin__manager .new {
+    background: #dee7ec;
+}
+
+/* IE won't understand but doesn't require it */
+#plugin__manager input[disabled] {
+    color: #ccc;
+    border-color: #ccc;
+}
+
+#plugin__manager .pm_menu,
+#plugin__manager .pm_info {
+    margin-left: 0;
+    text-align: left;
+}
+
+#plugin__manager .pm_menu {
+    float: left;
+    width: 48%;
+}
+
+#plugin__manager .pm_info {
+    float: right;
+    width: 50%;
+}
+
+#plugin__manager .common fieldset {
+    margin: 0;
+    padding: 0 0 1.0em 0;
+    text-align: left;
+    border: none;
+}
+
+#plugin__manager .common label {
+    padding: 0 0 0.5em 0;
+}
+
+#plugin__manager .common input.edit {
+    width: 24em;
+    margin: 0.5em;
+}
+
+#plugin__manager .plugins fieldset {
+    color: #000;
+    background: #fff;
+    text-align: right;
+    border-top: none;
+    border-right: none;
+    border-left: none;
+}
+
+#plugin__manager .plugins fieldset.protected {
+    background: #fdd;
+    color: #000;
+}
+
+#plugin__manager .plugins fieldset.disabled {
+    background: #e0e0e0;
+    color: #a8a8a8;
+}
+
+#plugin__manager .plugins .legend {
+    color: #000;
+    background: inherit;
+    display: block;
+    margin: 0;
+    padding: 0;
+    font-size: 1em;
+    line-height: 1.4em;
+    font-weight: normal;
+    text-align: left;
+    float: left;
+    padding: 0;
+    clear: none;
+}
+
+#plugin__manager .plugins .button {
+    font-size: 95%;
+}
+
+#plugin__manager .plugins fieldset.buttons {
+    border: none;
+}
+
+#plugin__manager .plugins fieldset.buttons .button {
+    float: left;
+}
+
+#plugin__manager .pm_info h3 {
+    margin-left: 0;
+}
+
+#plugin__manager .pm_info dl {
+    margin: 1em 0;
+    padding: 0;
+}
+
+#plugin__manager .pm_info dt {
+    width: 6em;
+    float: left;
+    clear: left;
+    margin: 0;
+    padding: 0;
+}
+
+#plugin__manager .pm_info dd {
+    margin: 0 0 0 7em;
+    padding: 0;
+    background: none;
+}
+
+#plugin__manager .plugins .enable {
+    float: left;
+    width: auto;
+    margin-right: 0.5em;
+}
 
 /* end admin plugin styles */