Merge branch 'master' of git://github.com/splitbrain/dokuwiki

23 files changed, 355 insertions, 160 deletions

diff --git a/_test/cases/inc/indexer_idx_indexlengths.test.php b/_test/cases/inc/indexer_idx_indexlengths.test.php
index d1339a111..8565639be 100644
--- a/_test/cases/inc/indexer_idx_indexlengths.test.php
+++ b/_test/cases/inc/indexer_idx_indexlengths.test.php
@@ -56,66 +56,5 @@ class indexer_idx_indexlengths_test extends UnitTestCase {
     }
 }
 
-class indexer_idx_indexlengths_time extends UnitTestCase {
-
-    /**
-     * Test the time improvments of the new function
-     * Time reference for 10000 call oneWords: 4,6s
-     * It's 90% faster
-     */
-    function test_oneWord(){
-        global $conf;
-        $filter[8] = array('dokuwiki');
-        $start = microtime(true);
-        for ($i = 0; $i < 10000; $i++) {
-            $result = idx_indexLengths(&$filter);
-        }
-        $end = microtime(true);
-        $time = $end - $start;
-        $timeref = 4.6*0.10; // actual execution time of 4,6s for 10000 calls
-        echo "1) 10% ref : $timeref -> $time \n";
-        $this->assertTrue($time < $timeref);
-    }
-
-    /**
-     * Test the time improvments of the new function
-     * Time reference for 10000 call moreWords: 4,6s
-     * It's 90% faster
-     */
-    function test_moreWords() {
-        global $conf;
-        $filter = array( 4 => array('test'), 8 => array('dokuwiki'), 7 => array('powered'));
-        // more words should return the indexes
-        $start = microtime(true);
-        for ($i = 0; $i < 10000; $i++) {
-            $result = idx_indexLengths(&$filter);
-        }
-        $end = microtime(true);
-        $time = $end - $start;
-        $timeref = 4.6*0.10; // actual execution time of 4,6s for 10000 calls
-        echo "2) 10% ref : $timeref -> $time \n";
-        $this->assertTrue($time < $timeref);
-    }
-
-    /**
-     * Test the time improvments of the new function
-     * Time reference for 10000 call on minValue: 4,9s
-     * Sould be at least 65% faster
-     * Test fail with no cache
-     */
-    function test_minValue() {
-        global $conf;
-        $filter = 5;
-        $start = microtime(true);
-        for ($i = 0; $i < 10000; $i++) {
-            $result = idx_indexLengths(&$filter);
-        }
-        $end = microtime(true);
-        $time = $end - $start;
-        $timeref = 4.9 * 0.35; // actual execution time of 4,9s for 10000 calls
-        echo "3) 35% ref : $timeref -> $time \n";
-        $this->assertTrue($time < $timeref);
-    }
-}
 
 //Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/_test/lib/cli_reporter.php b/_test/lib/cli_reporter.php
index e83911c73..3ad88119d 100644
--- a/_test/lib/cli_reporter.php
+++ b/_test/lib/cli_reporter.php
@@ -62,6 +62,14 @@ class CLIReporter extends SimpleReporter {
     }
 
     /**
+     * reset failinfo
+     */
+    function paintPass($message) {
+        parent::paintPass($message);
+        $this->_failinfo = '';
+    }
+
+    /**
      * Paint exception faildetail to STDERR.
      */
     function paintException($message) {
diff --git a/inc/common.php b/inc/common.php
index 003546409..390b038a5 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -987,9 +987,10 @@ function saveWikiText($id,$text,$summary,$minor=false){
         $mfiles = metaFiles($id);
         $changelog = metaFN($id, '.changes');
         $metadata  = metaFN($id, '.meta');
+        $subscribers = metaFN($id, '.mlist');
         foreach ($mfiles as $mfile) {
-            // but keep per-page changelog to preserve page history and keep meta data
-            if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata) { @unlink($mfile); }
+            // but keep per-page changelog to preserve page history, keep subscriber list and keep meta data
+            if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata && $mfile!==$subscribers) { @unlink($mfile); }
         }
         // purge meta data
         p_purge_metadata($id);
diff --git a/inc/fulltext.php b/inc/fulltext.php
index e90205e9c..943a5d401 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -313,7 +313,7 @@ function ft_snippet($id,$highlight){
         $len = utf8_strlen($text);
 
         // build a regexp from the phrases to highlight
-        $re1 = '('.join('|',array_map('preg_quote_cb',array_filter((array) $highlight))).')';
+        $re1 = '('.join('|',array_map('ft_snippet_re_preprocess', array_map('preg_quote_cb',array_filter((array) $highlight)))).')';
         $re2 = "$re1.{0,75}(?!\\1)$re1";
         $re3 = "$re1.{0,45}(?!\\1)$re1.{0,45}(?!\\1)(?!\\2)$re1";
 
@@ -387,6 +387,24 @@ function ft_snippet($id,$highlight){
 }
 
 /**
+ * Wraps a search term in regex boundary checks.
+ */
+function ft_snippet_re_preprocess($term) {
+    if(substr($term,0,2) == '\\*'){
+        $term = substr($term,2);
+    }else{
+        $term = '\b'.$term;
+    }
+
+    if(substr($term,-2,2) == '\\*'){
+        $term = substr($term,0,-2);
+    }else{
+        $term = $term.'\b';
+    }
+    return $term;
+}
+
+/**
  * Combine found documents and sum up their scores
  *
  * This function is used to combine searched words with a logical
@@ -678,7 +696,7 @@ function ft_queryParser($query){
                      break;
             case 'W+:':
                      $q['words'][]     = $body;
-                     $q['highlight'][] = str_replace('*', '', $body);
+                     $q['highlight'][] = $body;
                      $q['and'][]       = $body; // for backward compatibility
                      break;
             case 'P-:':
@@ -686,7 +704,7 @@ function ft_queryParser($query){
                      break;
             case 'P+:':
                      $q['phrases'][]   = $body;
-                     $q['highlight'][] = str_replace('*', '', $body);
+                     $q['highlight'][] = $body;
                      break;
         }
     }
diff --git a/inc/html.php b/inc/html.php
index add559971..968a63e4e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -285,7 +285,7 @@ function html_draft(){
  */
 function html_hilight($html,$phrases){
     $phrases = array_filter((array) $phrases);
-    $regex = join('|',array_map('preg_quote_cb',$phrases));
+    $regex = join('|',array_map('ft_snippet_re_preprocess', array_map('preg_quote_cb',$phrases)));
 
     if ($regex === '') return $html;
     $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
diff --git a/inc/lang/en/index.txt b/inc/lang/en/index.txt
index 5adbfd898..152911bbb 100644
--- a/inc/lang/en/index.txt
+++ b/inc/lang/en/index.txt
@@ -1,4 +1,4 @@
-====== Index ======
+====== Sitemap ======
 
-This is an index over all available pages ordered by [[doku>namespaces|namespaces]].
+This is a sitemap over all available pages ordered by [[doku>namespaces|namespaces]].
 
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 5414f7a88..5c890246c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -29,7 +29,7 @@ $lang['btn_revs']   = 'Old revisions';
 $lang['btn_recent'] = 'Recent changes';
 $lang['btn_upload'] = 'Upload';
 $lang['btn_cancel'] = 'Cancel';
-$lang['btn_index']  = 'Index';
+$lang['btn_index']  = 'Sitemap';
 $lang['btn_secedit']= 'Edit';
 $lang['btn_login']  = 'Login';
 $lang['btn_logout'] = 'Logout';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 135d20d97..6bbd4c520 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -17,8 +17,9 @@
  * @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['encoding']              = 'utf-8';
+$lang['encoding']              = 'utf-8<';
 $lang['direction']             = 'ltr';
 $lang['doublequoteopening']    = '“';
 $lang['doublequoteclosing']    = '”';
@@ -121,7 +122,7 @@ $lang['js']['mediasmall']      = 'Versão Pequena';
 $lang['js']['mediamedium']     = 'Versão Média';
 $lang['js']['medialarge']      = 'Versão Grande';
 $lang['js']['mediaoriginal']   = 'Versão Original';
-$lang['js']['medialnk']        = 'Link para pagina de detalhes';
+$lang['js']['medialnk']        = 'Link para página de detalhes';
 $lang['js']['mediadirect']     = 'Link direto para original';
 $lang['js']['medianolnk']      = 'Sem Link';
 $lang['js']['medianolink']     = 'Sem link na imagem';
@@ -152,6 +153,7 @@ $lang['deletefail']            = 'Não foi possível excluir "%s" - verifique as
 $lang['mediainuse']            = 'O arquivo "%s" não foi excluído - ele ainda está em uso.';
 $lang['namespaces']            = 'Espaços de nome';
 $lang['mediafiles']            = 'Arquivos disponíveis em';
+$lang['accessdenied']          = 'Você não tem permissão para visualizar esta página.';
 $lang['mediausage']            = 'Use a seguinte sintaxe para referenciar esse arquivo:';
 $lang['mediaview']             = 'Ver o arquivo original';
 $lang['mediaroot']             = 'raiz';
@@ -167,6 +169,7 @@ $lang['current']               = 'atual';
 $lang['yours']                 = 'Sua versão';
 $lang['diff']                  = 'Mostrar diferenças com a revisão atual';
 $lang['diff2']                 = 'Mostrar diferenças entre as revisões selecionadas';
+$lang['difflink']              = 'Link para esta página de comparações';
 $lang['line']                  = 'Linha';
 $lang['breadcrumb']            = 'Visitou';
 $lang['youarehere']            = 'Você está aqui';
@@ -188,7 +191,7 @@ $lang['qb_bold']               = 'Texto em negrito';
 $lang['qb_italic']             = 'Texto em itálico';
 $lang['qb_underl']             = 'Texto sublinhado';
 $lang['qb_code']               = 'Texto de código';
-$lang['qb_strike']             = 'Texto riscado';
+$lang['qb_strike']             = 'Texto tachado';
 $lang['qb_h1']                 = 'Cabeçalho de nível 1';
 $lang['qb_h2']                 = 'Cabeçalho de nível 2';
 $lang['qb_h3']                 = 'Cabeçalho de nível 3';
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index acca3f5a1..a96e6b9db 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -440,7 +440,7 @@ class Doku_Handler {
                 array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]),
                 $pos
                 );
-        }elseif ( preg_match('/^\\\\\\\\[\w.:?\-;,]+?\\\\/u',$link[0]) ) {
+        }elseif ( preg_match('/^\\\\\\\\[^\\\\]+?\\\\/u',$link[0]) ) {
         // Windows Share
             $this->_addCall(
                 'windowssharelink',
diff --git a/inc/template.php b/inc/template.php
index 4eed30591..2693c485b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -664,7 +664,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
     // don't print the search form if search action has been disabled
     if (!actionOk('search')) return false;
 
-    print '<form action="'.wl().'" accept-charset="utf-8" class="search" id="dw__search"><div class="no">';
+    print '<form action="'.wl().'" accept-charset="utf-8" class="search" id="dw__search" method="get"><div class="no">';
     print '<input type="hidden" name="do" value="search" />';
     print '<input type="text" ';
     if($ACT == 'search') print 'value="'.htmlspecialchars($QUERY).'" ';
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index 3a04b7b09..35186f5dd 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -1,51 +1,48 @@
 <?php
-  if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
-  define('DOKU_MEDIADETAIL',1);
-  require_once(DOKU_INC.'inc/init.php');
-  //close session
-  session_write_close();
-
-  $IMG  = getID('media');
-  $ID   = cleanID($_REQUEST['id']);
-
-  if($conf['allowdebug'] && $_REQUEST['debug']){
-      print '<pre>';
-      foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
-          print '$'."conf['$x'] = '".$conf[$x]."';\n";
-      }
-      foreach(explode(' ','DOCUMENT_ROOT HTTP_HOST SCRIPT_FILENAME PHP_SELF '.
-                      'REQUEST_URI SCRIPT_NAME PATH_INFO PATH_TRANSLATED') as $x){
-          print '$'."_SERVER['$x'] = '".$_SERVER[$x]."';\n";
-      }
-      print "getID('media'): ".getID('media')."\n";
-      print "getID('media',false): ".getID('media',false)."\n";
-      print '</pre>';
-  }
-
-  $ERROR = false;
-  // check image permissions
-  $AUTH = auth_quickaclcheck($IMG);
-  if($AUTH >= AUTH_READ){
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+define('DOKU_MEDIADETAIL',1);
+require_once(DOKU_INC.'inc/init.php');
+//close session
+session_write_close();
+
+$IMG  = getID('media');
+$ID   = cleanID($_REQUEST['id']);
+
+if($conf['allowdebug'] && $_REQUEST['debug']){
+    print '<pre>';
+    foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
+        print '$'."conf['$x'] = '".$conf[$x]."';\n";
+    }
+    foreach(explode(' ','DOCUMENT_ROOT HTTP_HOST SCRIPT_FILENAME PHP_SELF '.
+                'REQUEST_URI SCRIPT_NAME PATH_INFO PATH_TRANSLATED') as $x){
+        print '$'."_SERVER['$x'] = '".$_SERVER[$x]."';\n";
+    }
+    print "getID('media'): ".getID('media')."\n";
+    print "getID('media',false): ".getID('media',false)."\n";
+    print '</pre>';
+}
+
+$ERROR = false;
+// check image permissions
+$AUTH = auth_quickaclcheck($IMG);
+if($AUTH >= AUTH_READ){
     // check if image exists
     $SRC = mediaFN($IMG);
     if(!@file_exists($SRC)){
-      //doesn't exist!
-
+        //doesn't exist!
+        header("HTTP/1.0 404 File not Found");
+        $ERROR = 'File not found';
     }
-  }else{
+}else{
     // no auth
     $ERROR = p_locale_xhtml('denied');
-  }
-
-  /*if(!$ERROR){
-    // load EXIF/IPTC/image details
-    $INFO = array();
-    $INFO['std']['']
-    imagesize
-  }*/
+}
 
+// this makes some general infos available as well as the info about the
+// "parent" page
+$INFO = pageinfo();
 
-  //start output and load template
-  header('Content-Type: text/html; charset=utf-8');
-  include(template('detail.php'));
+//start output and load template
+header('Content-Type: text/html; charset=utf-8');
+include(template('detail.php'));
 
diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index e199b773c..0ebcbf509 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -17,6 +17,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['admin_acl']             = 'Administração da Lista de Controles de Acesso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css
new file mode 100644
index 000000000..e79abe596
--- /dev/null
+++ b/lib/plugins/acl/rtl.css
@@ -0,0 +1,40 @@
+div#acl_manager div#acl__tree {
+    float: right;
+    text-align: right;
+}
+
+div#acl_manager div#acl__tree li {
+    padding-left: 0em;
+    padding-right: 1em;
+}
+
+div#acl_manager div#acl__tree ul img {
+    margin-left: 0.25em;
+    margin-right: 0em;
+}
+
+
+div#acl_manager div#acl__detail {
+    float: left;
+}
+
+div#acl_manager .aclgroup {
+    background: transparent url(pix/group.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
+
+div#acl_manager .acluser {
+    background: transparent url(pix/user.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
+
+div#acl_manager .aclpage {
+    background: transparent url(pix/page.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
+
+div#acl_manager .aclns {
+    background: transparent url(pix/ns.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
+
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 66e5b00e0..a944d6bd7 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -161,7 +161,7 @@ $lang['proxy____host']    = 'Proxy servername';
 $lang['proxy____port']    = 'Proxy port';
 $lang['proxy____user']    = 'Proxy user name';
 $lang['proxy____pass']    = 'Proxy password';
-$lang['proxy____ssl']     = 'Use SLL to connect to proxy';
+$lang['proxy____ssl']     = 'Use SSL to connect to proxy';
 $lang['proxy____except']  = 'Regular expression to match URLs for which the proxy should be skipped for.';
 
 /* Safemode Hack */
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index ecf302d81..222123876 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/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']                  = 'Configurações do DokuWiki';
 $lang['error']                 = 'As configurações não foram atualizadas devido a um valor inválido. Por favor, reveja suas alterações e reenvie-as.<br />O(s) valor(es) incorreto(s) serão exibidos contornados por uma borda vermelha.';
@@ -169,7 +170,7 @@ $lang['rss_type_o_rss1']       = 'RSS 1.0';
 $lang['rss_type_o_rss2']       = 'RSS 2.0';
 $lang['rss_type_o_atom']       = 'Atom 0.3';
 $lang['rss_type_o_atom1']      = 'Atom 1.0';
-$lang['rss_content_o_abstract'] = 'abstrato';
+$lang['rss_content_o_abstract'] = 'resumo';
 $lang['rss_content_o_diff']    = 'diff unificado';
 $lang['rss_content_o_htmldiff'] = 'tabela de diff formatada em HTML';
 $lang['rss_content_o_html']    = 'conteúdo completo da página em HTML';
diff --git a/lib/plugins/config/rtl.css b/lib/plugins/config/rtl.css
index 7cbedaa73..29cf731d5 100644
--- a/lib/plugins/config/rtl.css
+++ b/lib/plugins/config/rtl.css
@@ -6,3 +6,21 @@
     text-align: right;
 }
 
+#config__manager td.label {
+    padding: 0.8em 1em 0.6em 0;
+}
+
+#config__manager td.label span.outkey {
+    float: right;
+    margin-right: 1em;
+}
+
+#config__manager td.label label {
+    text-align: right;
+    clear: right;
+}
+
+#config__manager td.label img {
+    float: left;
+}
+
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 */
diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php
index 67732e8ef..907b4db5d 100644
--- a/lib/plugins/popularity/lang/pt-br/lang.php
+++ b/lib/plugins/popularity/lang/pt-br/lang.php
@@ -13,6 +13,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['name']                  = 'Retorno de popularidade (pode demorar um pouco para carregar)';
 $lang['submit']                = 'Enviar dados';
diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php
index 4ee4432ee..6d8ca2de5 100644
--- a/lib/plugins/revert/lang/pt-br/lang.php
+++ b/lib/plugins/revert/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']                  = 'Gerenciador de reversões';
 $lang['filter']                = 'Procura por páginas com spam';
diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php
index 2c9a281b9..4bc99fb0c 100644
--- a/lib/plugins/usermanager/lang/pt-br/lang.php
+++ b/lib/plugins/usermanager/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']                  = 'Gerenciamento de Usuários';
 $lang['noauth']                = '(o gerenciamento de usuários não está disponível)';
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 225868592..e4e92cdd2 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -201,6 +201,13 @@ var linkwiz = {
         if(sel.start == 0 && sel.end == 0) sel = linkwiz.selection;
 
         var stxt = sel.getText();
+
+        // don't include trailing space in selection
+        if(stxt.charAt(stxt.length - 1) == ' '){
+            sel.end--;
+            stxt = sel.getText();
+        }
+
         if(!stxt && !DOKU_UHC) stxt=title;
 
         // prepend colon inside namespaces for non namespace pages
@@ -218,6 +225,8 @@ var linkwiz = {
 
         pasteText(sel,link,{startofs: so, endofs: eo});
         linkwiz.hide();
+        // reset the entry to the parent namespace and remove : at the beginning
+        linkwiz.entry.value = linkwiz.entry.value.replace(/(^:)?[^:]*$/, '');
     },
 
     /**