From 5247e262aea9e2e03a3a60673b826546215f6976 Mon Sep 17 00:00:00 2001
From: Random <rfc@nm.ru>
Date: Sat, 17 Sep 2011 11:07:48 +0200
Subject: ru: fixes in lang.php and uploadmail.txt

---
 inc/lang/ru/lang.php       |  2 +-
 inc/lang/ru/uploadmail.txt | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 3a00a40af..ef560e3a2 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -363,4 +363,4 @@ $lang['media_perm_upload']     = 'Извините, у Вас недостато
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
 
-$lang['plugin_install_err']    = "Плагин установлен некорректро. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
+$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
diff --git a/inc/lang/ru/uploadmail.txt b/inc/lang/ru/uploadmail.txt
index fd7c4a7f8..77f79231e 100644
--- a/inc/lang/ru/uploadmail.txt
+++ b/inc/lang/ru/uploadmail.txt
@@ -1,13 +1,14 @@
 В вашу вики был закачан файл. Подробная информация:
 
-Файл        : @MEDIA@
-Дата        : @DATE@
-Браузер     : @BROWSER@
-Адрес IP    : @IPADDRESS@
-Хост        : @HOSTNAME@
-Размер      : @SIZE@
-Тип MIME    : @MIME@
-Пользователь: @USER@
+Файл         : @MEDIA@
+Старая версия: @OLD@
+Дата         : @DATE@
+Браузер      : @BROWSER@
+Адрес IP     : @IPADDRESS@
+Хост         : @HOSTNAME@
+Размер       : @SIZE@
+Тип MIME     : @MIME@
+Пользователь : @USER@
 
 -- 
 Это письмо было сгенерировано «ДокуВики» по адресу
-- 
cgit v1.2.3


From 95b451bc621ae202d0229176ad0712b22d14c953 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sat, 17 Sep 2011 19:36:34 +0200
Subject: Rework media manager HTML (JS and CSS will come)

---
 inc/html.php                  | 155 ++++++++++++-------
 inc/lang/de-informal/lang.php |  17 ++-
 inc/lang/de/lang.php          |  17 ++-
 inc/lang/en/lang.php          |  17 ++-
 inc/lang/fr/lang.php          |  12 +-
 inc/lang/pt/lang.php          |  11 +-
 inc/lang/ru/lang.php          |  13 +-
 inc/media.php                 | 339 +++++++++++++++++++-----------------------
 inc/template.php              |  71 +++++----
 9 files changed, 336 insertions(+), 316 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 1c48d6059..66bc83127 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -982,6 +982,73 @@ function html_backlinks(){
     }
 }
 
+function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
+    global $lang;
+    if ($id === null) {
+        global $ID;
+        $id = $ID;
+    }
+    $media_or_wikiFN = $media ? 'mediaFN' : 'wikiFN';
+    $ml_or_wl = $media ? 'ml' : 'wl';
+    $l_minor = $r_minor = '';
+
+    if(!$l_rev){
+        $l_head = '&mdash;';
+    }else{
+        $l_info   = getRevisionInfo($id,$l_rev,true, $media);
+        if($l_info['user']){
+            $l_user = editorinfo($l_info['user']);
+            if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
+        } else {
+            $l_user = $l_info['ip'];
+        }
+        $l_user  = '<span class="user">'.$l_user.'</span>';
+        $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
+        if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
+
+        $l_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$l_rev").'">'.
+        $id.' ['.dformat($l_rev).']</a>'.
+        '<br />'.$l_user.' '.$l_sum;
+    }
+
+    if($r_rev){
+        $r_info   = getRevisionInfo($id,$r_rev,true, $media);
+        if($r_info['user']){
+            $r_user = editorinfo($r_info['user']);
+            if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
+        } else {
+            $r_user = $r_info['ip'];
+        }
+        $r_user = '<span class="user">'.$r_user.'</span>';
+        $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
+        if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+        $r_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$r_rev").'">'.
+        $id.' ['.dformat($r_rev).']</a>'.
+        '<br />'.$r_user.' '.$r_sum;
+    }elseif($_rev = @filemtime($media_or_wikiFN($id))){
+        $_info   = getRevisionInfo($id,$_rev,true, $media);
+        if($_info['user']){
+            $_user = editorinfo($_info['user']);
+            if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
+        } else {
+            $_user = $_info['ip'];
+        }
+        $_user = '<span class="user">'.$_user.'</span>';
+        $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
+        if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+        $r_head  = '<a class="wikilink1" href="'.$ml_or_wl($id).'">'.
+        $id.' ['.dformat($_rev).']</a> '.
+        '('.$lang['current'].')'.
+        '<br />'.$_user.' '.$_sum;
+    }else{
+        $r_head = '&mdash; ('.$lang['current'].')';
+    }
+
+    return array($l_head, $r_head, $l_minor, $r_minor);
+}
+
 /**
  * show diff
  *
@@ -1056,59 +1123,7 @@ function html_diff($text='',$intro=true,$type=null){
         }
         $r_text = rawWiki($ID,$r_rev);
 
-        if(!$l_rev){
-            $l_head = '&mdash;';
-        }else{
-            $l_info   = getRevisionInfo($ID,$l_rev,true);
-            if($l_info['user']){
-                $l_user = editorinfo($l_info['user']);
-                if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
-            } else {
-                $l_user = $l_info['ip'];
-            }
-            $l_user  = '<span class="user">'.$l_user.'</span>';
-            $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
-            if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
-
-            $l_head = '<a class="wikilink1" href="'.wl($ID,"rev=$l_rev").'">'.
-            $ID.' ['.dformat($l_rev).']</a>'.
-            '<br />'.$l_user.' '.$l_sum;
-        }
-
-        if($r_rev){
-            $r_info   = getRevisionInfo($ID,$r_rev,true);
-            if($r_info['user']){
-                $r_user = editorinfo($r_info['user']);
-                if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
-            } else {
-                $r_user = $r_info['ip'];
-            }
-            $r_user = '<span class="user">'.$r_user.'</span>';
-            $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
-            if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
-
-            $r_head = '<a class="wikilink1" href="'.wl($ID,"rev=$r_rev").'">'.
-            $ID.' ['.dformat($r_rev).']</a>'.
-            '<br />'.$r_user.' '.$r_sum;
-        }elseif($_rev = @filemtime(wikiFN($ID))){
-            $_info   = getRevisionInfo($ID,$_rev,true);
-            if($_info['user']){
-                $_user = editorinfo($_info['user']);
-                if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
-            } else {
-                $_user = $_info['ip'];
-            }
-            $_user = '<span class="user">'.$_user.'</span>';
-            $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
-            if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
-
-            $r_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
-            $ID.' ['.dformat($_rev).']</a> '.
-            '('.$lang['current'].')'.
-            '<br />'.$_user.' '.$_sum;
-        }else{
-            $r_head = '&mdash; ('.$lang['current'].')';
-        }
+        list($l_head, $r_head, $l_minor, $r_minor) = html_diff_head($l_rev, $r_rev);
     }
 
     $df = new Diff(explode("\n",htmlspecialchars($l_text)),
@@ -1811,3 +1826,37 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
     return $out;
 }
 
+function html_tabs($tabs, $current_tab = null) {
+    echo '<ul class="tabs">';
+
+    foreach($tabs as $id => $tab) {
+        html_tab($tab['href'], $tab['caption'], $id === $current_tab);
+    }
+
+    echo '</ul>';
+    echo '<div class="clearer"></div>';
+}
+/**
+ * Prints a single tab
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @author Adrian Lang <mail@adrianlang.de>
+ *
+ * @param string $href - tab href
+ * @param string $caption - tab caption
+ * @param boolean $selected - is tab selected
+ */
+
+function html_tab($href, $caption, $selected=false) {
+    $tab = '<li>';
+    if ($selected) {
+        $tab .= '<strong>';
+    } else {
+        $tab .= '<a href="' . hsc($href) . '">';
+    }
+    $tab .= hsc($caption)
+         .  '</' . ($selected ? 'strong' : 'a') . '>'
+         .  '</li>';
+    echo $tab;
+}
+
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 4f762b55d..4d7c26621 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -345,15 +345,16 @@ $lang['media_searchtab']       = 'Suchen';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_thumbsview']      = 'Miniaturansicht';
-$lang['media_listview']        = 'Detailansicht';
-$lang['media_sort']            = 'Sortieren';
-$lang['media_sort_name']       = 'nach Name';
-$lang['media_sort_date']       = 'nach Datum';
+$lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansicht';
+$lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
+$lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
+$lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
+$lang['media_files']           = 'Medien im Namespace <strong>%s</strong>.';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
 $lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
-$lang['media_edit']            = 'Bearbeiten';
-$lang['media_history']         = 'Versionsverlauf der Datei.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
+$lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
 $lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
 $lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
@@ -362,4 +363,4 @@ $lang['media_restore']         = 'Diese Version wiederherstellen';
 
 $lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
 
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index a289f9987..360e6b428 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -345,15 +345,16 @@ $lang['media_searchtab']       = 'Suchen';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_thumbsview']      = 'Miniaturansicht';
-$lang['media_listview']        = 'Detailansicht';
-$lang['media_sort']            = 'Sortieren';
-$lang['media_sort_name']       = 'nach Name';
-$lang['media_sort_date']       = 'nach Datum';
+$lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansicht';
+$lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
+$lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
+$lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
+$lang['media_files']           = 'Medien im Namespace <strong>%s</strong>.';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
 $lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
-$lang['media_edit']            = 'Bearbeiten';
-$lang['media_history']         = 'Versionsverlauf der Datei.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
+$lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
 $lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
 $lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
@@ -362,4 +363,4 @@ $lang['media_restore']         = 'Diese Version wiederherstellen';
 
 $lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
 
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index f082c1655..fbfd0e34f 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -337,15 +337,16 @@ $lang['media_searchtab']       = 'Search';
 $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
-$lang['media_thumbsview']      = 'Thumbnails';
-$lang['media_listview']        = 'List';
-$lang['media_sort']            = 'Sort';
-$lang['media_sort_name']       = 'by name';
-$lang['media_sort_date']       = 'by date';
+$lang['media_list_thumbs']     = '<span>Show list as</span> thumbnails';
+$lang['media_list_rows']       = '<span>Show list as</span> list';
+$lang['media_sort_name']       = '<span>Sort by</span> name';
+$lang['media_sort_date']       = '<span>Sort by</span> date';
+$lang['media_files']           = 'Media files in the <strong>%s</strong> namespace.';
 $lang['media_upload']          = 'Upload to the <strong>%s</strong> namespace.';
 $lang['media_search']          = 'Search in the <strong>%s</strong> namespace.';
-$lang['media_edit']            = 'Edit';
-$lang['media_history']         = 'These are the older revisions of the file.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = 'Edit <span class="%s">%s</span>';
+$lang['media_history']         = 'History of <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
@@ -354,4 +355,4 @@ $lang['media_restore']         = 'Restore this version';
 
 $lang['plugin_install_err']    = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
 
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 53d3b7665..c73febc00 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -351,15 +351,13 @@ $lang['media_searchtab']       = 'Rechercher';
 $lang['media_viewtab']         = 'Voir';
 $lang['media_edittab']         = 'Éditer';
 $lang['media_historytab']      = 'Historique';
-$lang['media_thumbsview']      = 'Miniatures';
-$lang['media_listview']        = 'Liste';
-$lang['media_sort']            = 'Tri';
-$lang['media_sort_name']       = 'par nom';
-$lang['media_sort_date']       = 'par date';
+$lang['media_sort_name']       = '<span>Tri par</span> nom';
+$lang['media_sort_date']       = '<span>Tri par</span> date';
 $lang['media_upload']          = 'Télécharger dans la catégorie <strong>%s</strong>.';
 $lang['media_search']          = 'Chercher dans la catégorie <strong>%s</strong>.';
-$lang['media_edit']            = 'Éditer';
-$lang['media_history']         = 'Anciennes révision du fichier.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = 'Éditer <span class="%s">%s</span>';
+$lang['media_history']         = 'Historique du <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'métadonnées éditées';
 $lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.';
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index ef67a284c..6a2034a95 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -309,15 +309,14 @@ $lang['media_searchtab']  = 'Procurar';
 $lang['media_viewtab']    = 'Ver';
 $lang['media_edittab']    = 'Editar';
 $lang['media_historytab'] = 'Histórico';
-$lang['media_thumbsview'] = 'Miniaturas';
-$lang['media_listview']   = 'Lista';
 $lang['media_sort']       = 'Ordenar';
-$lang['media_sort_name']  = 'por nome';
-$lang['media_sort_date']  = 'por data';
+$lang['media_sort_name']  = '<span>Ordenar por</span> nome';
+$lang['media_sort_date']  = '<span>Ordenar por</span> data';
 $lang['media_upload']     = 'Enviar para o grupo <strong>%s</strong>.';
 $lang['media_search']     = 'Procurar no grupo <strong>%s</strong>.';
-$lang['media_edit']       = 'Editar';
-$lang['media_history']    = 'Estas são as revisões anteriores do ficheiro.';
+$lang['media_view']       = '<span class="%s">%s</span>';
+$lang['media_edit']       = 'Editar <span class="%s">%s</span>';
+$lang['media_history']    = 'Histórico do <span class="%s">%s</span>';
 $lang['media_meta_edited']= 'metadata editada';
 $lang['media_perm_read']  = 'Perdão, não tem permissão para ler ficheiros.';
 $lang['media_perm_upload']= 'Perdão, não tem permissão para enviar ficheiros.';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index ef560e3a2..52c1dc20b 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -348,19 +348,16 @@ $lang['media_searchtab']       = 'Поиск';
 $lang['media_viewtab']         = 'Просмотр';
 $lang['media_edittab']         = 'Правка';
 $lang['media_historytab']      = 'История';
-$lang['media_thumbsview']      = 'Иконками';
-$lang['media_listview']        = 'Списком';
-$lang['media_sort']            = 'Сортировка';
-$lang['media_sort_name']       = 'по имени';
-$lang['media_sort_date']       = 'по дате';
+$lang['media_sort_name']       = '<span>Сортировка по</span> имени';
+$lang['media_sort_date']       = '<span>Сортировка по</span> дате';
 $lang['media_upload']          = 'Загрузка в пространство имён <strong>%s</strong>.';
 $lang['media_search']          = 'Поиск в пространстве имён <strong>%s</strong>.';
-$lang['media_edit']            = 'Правка';
-$lang['media_history']         = 'Это предыдущие версии файлов.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = 'Правка <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'метаданные изменены';
 $lang['media_perm_read']       = 'Извините, у Вас недостаточно прав для чтения файлов.';
 $lang['media_perm_upload']     = 'Извините, у Вас недостаточно прав для загрузки файлов.';
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
 
-$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
+$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
diff --git a/inc/media.php b/inc/media.php
index 451a205db..ea612ea3f 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -108,10 +108,10 @@ function media_metaform($id,$auth){
     $src = mediaFN($id);
 
     // output
-    $action = media_managerURL(array('tab_details' => 'view'));
-    echo '<form action="'.$action.'" id="mediamanager__save_meta" accept-charset="utf-8" method="post" class="meta">'.NL;
-
-    formSecurityToken();
+    $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view')),
+                                'class' => 'meta'));
+    $form->addHidden('img', $id);
+    $form->addHidden('mediado', 'save');
     foreach($fields as $key => $field){
         // get current value
         if (empty($field[0])) continue;
@@ -126,33 +126,19 @@ function media_metaform($id,$auth){
         $p['id']    = 'meta__'.$key;
         $p['name']  = 'meta['.$field[0].']';
 
-        // put label
-        echo '<div class="metafield">';
-        echo '<label for="meta__'.$key.'">';
-        echo ($lang[$field[1]]) ? $lang[$field[1]] : $field[1];
-        echo ':</label>';
-
-        // put input field
+        $form->addElement('<div class="row">');
         if($field[2] == 'text'){
-            $p['value'] = $value;
-            $p['type']  = 'text';
-            $att = buildAttributes($p);
-            echo "<input $att/>".NL;
+            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class']));
         }else{
             $att = buildAttributes($p);
-            echo "<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>'.NL;
+            $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
         }
-        echo '</div>'.NL;
+        $form->addElement('</div>');
     }
-    echo '<div class="buttons">'.NL;
-    echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
-    echo '<input type="hidden" name="mediado" value="save" />';
-
-    $do = 'mediado';
-    echo '<input name="'.$do.'[save]" type="submit" value="'.$lang['btn_save'].
-        '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
-    echo '</div>'.NL;
-    echo '</form>'.NL;
+    $form->addElement('<div class="buttons">');
+    $form->addElement(form_makeButton('submit', '', $lang['btn_save'], array('accesskey' => 's', 'name' => 'mediado[save]')));
+    $form->addElement('</div>');
+    $form->printForm();
 }
 
 /**
@@ -588,11 +574,11 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
         }else {
             if ($fullscreenview) {
-                $view = $_REQUEST['view'];
-                if ($view == 'list') {
-                    echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+                $view = $_REQUEST['list'];
+                if ($view == 'rows') {
+                    echo '<ul class="rows">';
                 } else {
-                    echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+                    echo '<ul class="thumbs">';
                 }
             }
             foreach($data as $item){
@@ -608,41 +594,26 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
     if (!$fullscreenview) media_searchform($ns);
 }
 
-/**
- * Prints mediamanager tab
- *
- * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $link - tab href
- * @param string $class - tab css class
- * @param string $name - tab caption
- * @param boolean $selected - is tab selected
- */
-function media_tab($link, $class, $name, $selected=false) {
-    if ($selected) $class .= ' selected';
-    $tab = '<a href="'.$link.'" class="'.$class.'" >'.$name.'</a>';
-    echo $tab;
-}
-
 /**
  * Prints tabs for files list actions
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ * @author Adrian Lang <mail@adrianlang.de>
+ *
  * @param string $selected_tab - opened tab
  */
+
 function media_tabs_files($selected_tab = ''){
     global $lang;
+    $tabs = array();
+    foreach(array('files'  => 'mediaselect',
+                  'upload' => 'media_uploadtab',
+                  'search' => 'media_searchtab') as $tab => $caption) {
+        $tabs[$tab] = array('href'    => media_managerURL(array('tab_files' => $tab), '&'),
+                            'caption' => $lang[$caption]);
+    }
 
-    echo '<div class="mediamanager-tabs" id="mediamanager__tabs_files">';
-
-    media_tab(media_managerURL(array('tab_files' => 'files')),
-        'files', $lang['mediaselect'], ($selected_tab == 'files'));
-    media_tab(media_managerURL(array('tab_files' => 'upload')),
-        'upload', $lang['media_uploadtab'], ($selected_tab == 'upload'));
-    media_tab(media_managerURL(array('tab_files' => 'search')),
-        'search', $lang['media_searchtab'], ($selected_tab == 'search'));
-
-    echo '<div class="clearer"></div>';
-    echo '</div>';
+    html_tabs($tabs, $selected_tab);
 }
 
 /**
@@ -654,23 +625,21 @@ function media_tabs_files($selected_tab = ''){
 function media_tabs_details($image, $selected_tab = ''){
     global $lang, $conf;
 
-    echo '<div class="mediamanager-tabs" id="mediamanager__tabs_details">';
-
-    media_tab(media_managerURL(array('tab_details' => 'view')),
-        'view', $lang['media_viewtab'], ($selected_tab == 'view'));
+    $tabs = array();
+    $tabs['view'] = array('href'    => media_managerURL(array('tab_details' => 'view'), '&'),
+                          'caption' => $lang['media_viewtab']);
 
     list($ext, $mime) = mimetype($image);
     if ($mime == 'image/jpeg' && @file_exists(mediaFN($image))) {
-        media_tab(media_managerURL(array('tab_details' => 'edit')),
-            'edit', $lang['media_edittab'], ($selected_tab == 'edit'));
+        $tabs['edit'] = array('href'    => media_managerURL(array('tab_details' => 'edit'), '&'),
+                              'caption' => $lang['media_edittab']);
     }
     if ($conf['mediarevisions']) {
-        media_tab(media_managerURL(array('tab_details' => 'history')),
-            'history', $lang['media_historytab'], ($selected_tab == 'history'));
+        $tabs['history'] = array('href'    => media_managerURL(array('tab_details' => 'history'), '&'),
+                                 'caption' => $lang['media_historytab']);
     }
 
-    echo '<div class="clearer"></div>';
-    echo '</div>';
+    html_tabs($tabs, $selected_tab);
 }
 
 /**
@@ -678,42 +647,41 @@ function media_tabs_details($image, $selected_tab = ''){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_tab_files_options($ns, $sort){
-    global $lang;
-
-    echo '<div class="background-container">';
-
-    echo '<strong class="namespace">';
-    echo $ns ? $ns : '['.$lang['mediaroot'].']';
-    echo '</strong>';
-
-    echo '<div id="mediamanager__tabs_list">';
-
-    echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'" id="mediamanager__link_thumbs" >';
-    echo $lang['media_thumbsview'];
-    echo '</a>';
-
-    echo '<a href="'.media_managerURL(array('view' => 'list')).'" id="mediamanager__link_list" >';
-    echo $lang['media_listview'];
-    echo '</a>';
-
-    echo '</div>';
+function media_tab_files_options(){
+    global $lang, $NS;
+    $sort = _media_get_sort_type();
+    $form = new Doku_Form(array('class' => 'actions', 'method' => 'get'));
+    $form->addHidden('sectok', null);
+    $form->addHidden('ns', $NS);
+    $form->addHidden('do', 'media');
+    $form->addElement('<ul>');
+    foreach(array('list' => array('listType', array('thumbs', 'rows')),
+                  'sort' => array('sortBy', array('name', 'date'), $sort))
+            as $group => $content) {
+        if (count($content) < 3) {
+            $content[2] = isset($_REQUEST[$group])
+                            ? $_REQUEST[$group]
+                            : $content[1][0];
+        }
 
-    echo '<div id="mediamanager__sort">';
-    $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'id' => 'mediamanager__form_sort'));
-    $form->addElement(form_makeListboxField(
-                        'sort',
-                        array(
-                            'name' => $lang['media_sort_name'],
-                            'date' => $lang['media_sort_date']),
-                        $sort,
-                        $lang['media_sort']));
+        $form->addElement('<li class="' . $content[0] . '">');
+        foreach($content[1] as $option) {
+            $attrs = array();
+            if ($content[2] == $option) {
+                $attrs['checked'] = 'checked';
+            }
+            $form->addElement(form_makeRadioField($group, $option,
+                                       $lang['media_' . $group . '_' . $option],
+                                                  $content[0] . '__' . $option,
+                                                  $option, $attrs));
+        }
+        $form->addElement('</li>');
+    }
+    $form->addElement('<li>');
     $form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
+    $form->addElement('</li>');
+    $form->addElement('</ul>');
     $form->printForm();
-    echo '</div>';
-
-    echo '<div class="clearer"></div>';
-    echo '</div>';
 }
 
 /**
@@ -723,12 +691,14 @@ function media_tab_files_options($ns, $sort){
  * @return string - sort type
  */
 function _media_get_sort_type() {
-    $sort = $_REQUEST['sort'];
-    if (!$sort && (strpos($_COOKIE['DOKU_PREFS'], 'sort') >= 0)) {
+    $sort = 'name';
+    if (isset($_REQUEST['sort'])) {
+        $sort = $_REQUEST['sort'];
+    } elseif (strpos($_COOKIE['DOKU_PREFS'], 'sort') >= 0) {
         $parts = explode('#', $_COOKIE['DOKU_PREFS']);
-            for ($i = 0; $i < count($parts); $i+=2){
-                if ($parts[$i] == 'sort') $sort = $parts[$i+1];
-            }
+        for ($i = 0; $i < count($parts); $i+=2){
+            if ($parts[$i] == 'sort') $sort = $parts[$i+1];
+        }
     }
     return $sort;
 }
@@ -742,16 +712,11 @@ function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    $sort = _media_get_sort_type();
-    media_tab_files_options($ns, $sort);
-
-    echo '<div class="scroll-container" >';
     if($auth < AUTH_READ){
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
-        media_filelist($ns,$auth,$jump,true,$sort);
+        media_filelist($ns,$auth,$jump,true,_media_get_sort_type());
     }
-    echo '</div>';
 }
 
 /**
@@ -763,12 +728,10 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="background-container">';
-    echo sprintf($lang['media_upload'], $ns ? $ns : '['.$lang['mediaroot'].']');
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
-    if ($auth >= AUTH_UPLOAD) echo '<div class="upload">' . $lang['mediaupload'] . '</div>';
+    echo '<div class="upload">';
+    if ($auth >= AUTH_UPLOAD) {
+        echo '<p>' . $lang['mediaupload'] . '</p>';
+    }
     media_uploadform($ns, $auth, true);
     echo '</div>';
 }
@@ -784,13 +747,12 @@ function media_tab_search($ns,$auth=null) {
     $do = $_REQUEST['mediado'];
     $query = $_REQUEST['q'];
     if (!$query) $query = '';
+    echo '<div class="search">';
 
-    $sort = _media_get_sort_type();
-    media_tab_files_options($ns, $sort);
-
-    echo '<div class="scroll-container">';
     media_searchform($ns, $query, true);
-    if ($do == 'searchlist') media_searchlist($query,$ns,$auth,true,$sort);
+    if ($do == 'searchlist') {
+        media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
+    }
     echo '</div>';
 }
 
@@ -803,14 +765,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     global $lang, $conf;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="background-container">';
-    list($ext,$mime,$dl) = mimetype($image,false);
-    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
-    $class = 'select mediafile mf_'.$class;
-    echo '<span class="'.$class.'" >'.$image.'</span>';
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
     if ($image && $auth >= AUTH_READ) {
         $meta = new JpegMeta(mediaFN($image, $rev));
         media_preview($image, $auth, $rev, $meta);
@@ -820,7 +774,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     } else {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>';
     }
-    echo '</div>';
 }
 
 /**
@@ -832,16 +785,10 @@ function media_tab_edit($image, $ns, $auth=null) {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="background-container">';
-    echo $lang['media_edit'];
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
     if ($image) {
         list($ext, $mime) = mimetype($image);
         if ($mime == 'image/jpeg') media_metaform($image,$auth);
     }
-    echo '</div>';
 }
 
 /**
@@ -854,11 +801,6 @@ function media_tab_history($image, $ns, $auth=null) {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
     $do = $_REQUEST['mediado'];
 
-    echo '<div class="background-container">';
-    echo $lang['media_history'];
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
     if ($auth >= AUTH_READ && $image) {
         if ($do == 'diff'){
             media_diff($image, $ns, $auth);
@@ -869,7 +811,6 @@ function media_tab_history($image, $ns, $auth=null) {
     } else {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
-    echo '</div>';
 }
 
 /**
@@ -880,7 +821,7 @@ function media_tab_history($image, $ns, $auth=null) {
 function media_preview($image, $auth, $rev=false, $meta=false) {
     global $lang;
 
-    echo '<div class="mediamanager__preview">';
+    echo '<div class="image">';
 
     $size = media_image_preview_size($image, $rev, $meta);
 
@@ -896,7 +837,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $more['w'] = $size[0];
         $more['h'] = $size[1];
         $src = ml($image, $more);
-        echo '<img src="'.$src.'" alt="'.$image.'" style="max-width: '.$size[0].'px;" />';
+        echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />';
     }
 
     echo '</div>';
@@ -910,7 +851,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
 function media_preview_buttons($image, $auth, $rev=false) {
     global $lang, $conf;
 
-    echo '<div class="mediamanager__preview_buttons">';
+    echo '<ul class="actions">';
 
     $more = '';
     if ($rev) {
@@ -924,9 +865,12 @@ function media_preview_buttons($image, $auth, $rev=false) {
     if (@file_exists(mediaFN($image, $rev))) {
 
         // view original file button
-        $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
+        $form = new Doku_Form(array('action'=>$link, 'method'=>'get', 'target' => '_blank'));
+        $form->addHidden('sectok', null);
         $form->addElement(form_makeButton('submit','',$lang['mediaview']));
+        echo '<li>';
         $form->printForm();
+        echo '</li>';
     }
 
     if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
@@ -935,8 +879,9 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
             'action'=>media_managerURL(array('delete' => $image), '&')));
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
+        echo '<li>';
         $form->printForm();
-
+        echo '</li>';
     }
 
     $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
@@ -946,7 +891,9 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
             'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'), '&')));
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
+        echo '<li>';
         $form->printForm();
+        echo '</li>';
     }
 
     if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
@@ -957,10 +904,12 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addHidden('mediado','restore');
         $form->addHidden('rev',$rev);
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
+        echo '<li>';
         $form->printForm();
+        echo '</li>';
     }
 
-    echo '</div>';
+    echo '</ul>';
 }
 
 /**
@@ -1046,7 +995,7 @@ function media_details($image, $auth, $rev=false, $meta=false) {
     if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
     $tags = media_file_tags($meta);
 
-    echo '<dl class="img_tags">';
+    echo '<dl>';
     foreach($tags as $tag){
         if ($tag['value']) {
             $value = cleanText($tag['value']);
@@ -1150,8 +1099,9 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         $difftype = $_REQUEST['difftype'];
 
         if (!$fromajax) {
-            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'),
-                'id' => 'mediamanager__form_diffview'));
+            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'method' => 'get'
+            ));
+            $form->addHidden('sectok', null);
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>');
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>');
             $form->addHidden('mediado', 'diff');
@@ -1167,57 +1117,76 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         }
     }
 
-    echo '<div class="mediamanager-preview">';
-    echo '<ul id="mediamanager__diff_table">';
+    list($l_head, $r_head) = html_diff_head($l_rev, $r_rev, $image, true);
 
-    echo '<li>';
+    ?>
+    <table>
+      <tr>
+        <th><?php echo $l_head; ?></th>
+        <th><?php echo $r_head; ?></th>
+      </tr>
+    <?php
+
+    echo '<tr class="image">';
+    echo '<td>';
     media_preview($image, $auth, $l_rev, $l_meta);
-    echo '</li>';
+    echo '</td>';
 
-    echo '<li>';
+    echo '<td>';
     media_preview($image, $auth, $r_rev, $r_meta);
-    echo '</li>';
+    echo '</td>';
+    echo '</tr>';
 
-    echo '<li>';
+    echo '<tr class="actions">';
+    echo '<td>';
     media_preview_buttons($image, $auth, $l_rev);
-    echo '</li>';
+    echo '</td>';
 
-    echo '<li>';
+    echo '<td>';
     media_preview_buttons($image, $auth, $r_rev);
-    echo '</li>';
+    echo '</td>';
+    echo '</tr>';
 
     $l_tags = media_file_tags($l_meta);
     $r_tags = media_file_tags($r_meta);
+    // FIXME r_tags-only stuff
     foreach ($l_tags as $key => $l_tag) {
         if ($l_tag['value'] != $r_tags[$key]['value']) {
-            $r_tags[$key]['class'] = 'highlighted';
-            $l_tags[$key]['class'] = 'highlighted';
+            $r_tags[$key]['highlighted'] = true;
+            $l_tags[$key]['highlighted'] = true;
         } else if (!$l_tag['value'] || !$r_tags[$key]['value']) {
             unset($r_tags[$key]);
             unset($l_tags[$key]);
         }
     }
 
+    echo '<tr>';
     foreach(array($l_tags,$r_tags) as $tags){
-        echo '<li><div>';
+        echo '<td>';
 
         echo '<dl class="img_tags">';
         foreach($tags as $tag){
             $value = cleanText($tag['value']);
             if (!$value) $value = '-';
             echo '<dt>'.$lang[$tag['tag'][1]].':</dt>';
-            echo '<dd class="'.$tag['class'].'" >';
+            echo '<dd>';
+            if ($tag['highlighted']) {
+                echo '<strong>';
+            }
             if ($tag['tag'][2] == 'date') echo dformat($value);
             else echo hsc($value);
+            if ($tag['highlighted']) {
+                echo '</strong>';
+            }
             echo '</dd>';
         }
         echo '</dl>';
 
-        echo '</div></li>';
+        echo '</td>';
     }
+    echo '</tr>';
 
-    echo '</ul>';
-    echo '</div>';
+    echo '</table>';
 
     if ($is_img && !$fromajax) echo '</div>';
 }
@@ -1250,14 +1219,14 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
     $r_src = ml($image, $r_more);
 
     // slider
-    echo '<div id="mediamanager__'.$type.'_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '<div id="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
 
-    // two image's in div's
-    echo '<div id="mediamanager__diff_layout">';
-    echo '<div id="mediamanager__diff_'.$type.'_image1" style="max-width: '.$l_size[0].'px;">';
+    // two images in divs
+    echo '<div id="diff_' . $type . '">';
+    echo '<div class="image1" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$l_src.'" alt="" />';
     echo '</div>';
-    echo '<div id="mediamanager__diff_'.$type.'_image2" style="max-width: '.$l_size[0].'px;">';
+    echo '<div class="image2" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$r_src.'" alt="" />';
     echo '</div>';
     echo '</div>';
@@ -1447,42 +1416,43 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
     $file = utf8_decodeFN($item['file']);
 
     // output
-    echo '<li><div>';
+    echo '<li><dl>';
 
+        echo '<dt>';
     if($item['isimg']) {
         media_printimgdetail($item, true);
 
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
-            'tab_details' => 'view')).'"><span>';
+            'tab_details' => 'view')).'">';
         echo media_printicon($item['id']);
-        echo '</span></a>';
+        echo '</a>';
     }
+    echo '</dt>';
     //echo '<input type=checkbox />';
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
         $name = hsc($item['id']);
     }
-    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
-        'tab_details' => 'view')).'" name="h_:'.$item['id'].'" class="name">'.$name.'</a>';
+    echo '<dd class="name"><a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
+        'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>';
 
     if($item['isimg']){
         $size = '';
         $size .= (int) $item['meta']->getField('File.Width');
         $size .= '&#215;';
         $size .= (int) $item['meta']->getField('File.Height');
-        echo '<span class="size">'.$size.'</span>';
+        echo '<dd class="size">'.$size.'</dd>';
     } else {
-        echo '<span class="size">&nbsp;</span>';
+        echo '<dd class="size">&nbsp;</dd>';
     }
     $date = dformat($item['mtime']);
-    echo '<span class="date">'.$date.'</span>';
+    echo '<dd class="date">'.$date.'</dd>';
     $filesize = filesize_h($item['size']);
-    echo '<span class="filesize">'.$filesize.'</span>';
-    echo '<div class="clearer"></div>';
-    echo '</div></li>'.NL;
+    echo '<dd class="filesize">'.$filesize.'</dd>';
+    echo '</dl></li>'.NL;
 }
 
 /**
@@ -1661,7 +1631,6 @@ function media_searchform($ns,$query='',$fullscreen=false){
     else $params['action'] = media_managerURL(array(), '&');
     $form = new Doku_Form($params);
     if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
-    $form->addElement(formSecurityToken());
     $form->addHidden('ns', $ns);
     if (!$fullscreen) $form->addHidden('do', 'searchlist');
     else $form->addHidden('mediado', 'searchlist');
diff --git a/inc/template.php b/inc/template.php
index 96e0668c2..58baca111 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1136,29 +1136,36 @@ function tpl_mediaFileList(){
     global $AUTH;
     global $NS;
     global $JUMPTO;
+    global $lang;
 
     $opened_tab = $_REQUEST['tab_files'];
     if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
+    // FIXME: define lang
+    echo '<h2 class="a11y">' . sprintf($lang['filelist_desc'], $NS) .  '</h2>';
+
     media_tabs_files($opened_tab);
 
+    echo '<div class="panelHeader">';
+    echo '<h3>';
+    printf($lang['media_' . $opened_tab],
+           hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
+    echo '</h3>';
+    if ($opened_tab === 'search' || $opened_tab === 'files') {
+        media_tab_files_options();
+    }
+    echo '</div>';
+
+    echo '<div class="panelContent">';
     if ($opened_tab == 'files') {
-        echo '<div id="mediamanager__files">';
         media_tab_files($NS,$AUTH,$JUMPTO);
-        echo '</div>';
-
     } elseif ($opened_tab == 'upload') {
-        echo '<div id="mediamanager__files">';
         media_tab_upload($NS,$AUTH,$JUMPTO);
-        echo '</div>';
-
     } elseif ($opened_tab == 'search') {
-        echo '<div id="mediamanager__files">';
         media_tab_search($NS,$AUTH);
-        echo '</div>';
     }
-
+    echo '</div>';
 }
 
 /**
@@ -1170,7 +1177,7 @@ function tpl_mediaFileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_mediaFileDetails($image, $rev){
-    global $AUTH, $NS, $conf, $DEL;
+    global $AUTH, $NS, $conf, $DEL, $lang;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
     if (!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return '';
@@ -1195,21 +1202,26 @@ function tpl_mediaFileDetails($image, $rev){
 
     media_tabs_details($image, $opened_tab);
 
+    echo '<div class="panelHeader"><h3>';
+    list($ext,$mime,$dl) = mimetype($image,false);
+    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+    $class = 'select mediafile mf_'.$class;
+    printf($lang['media_' . $opened_tab], $class, $image);
+    echo '</h3></div>';
+
+    echo '<div class="panelContent">';
+
     if ($opened_tab == 'view') {
-        echo '<div id="mediamanager__details">';
         media_tab_view($image, $NS, $AUTH, $rev);
-        echo '</div>';
 
     } elseif ($opened_tab == 'edit' && !$removed) {
-        echo '<div id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
-        echo '</div>';
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
-        echo '<div id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
-        echo '</div>';
     }
+
+    echo '</div>';
 }
 
 /**
@@ -1482,44 +1494,37 @@ function tpl_favicon($types=array('favicon')) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_media() {
-    //
     global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf;
     $fullscreen = true;
-    require_once(DOKU_INC.'lib/exe/mediamanager.php');
+    require_once DOKU_INC.'lib/exe/mediamanager.php';
 
     if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
     if (isset($IMG)) $image = $IMG;
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<div id="mediamanager__page">';
     echo '<h1>'.$lang['btn_media'].'</h1>';
-    echo '<div id="mediamanager__layout">';
+    echo '<div id="mediamanager__page">';
 
-    echo '<div id="mediamanager__layout_namespaces" class="layout-resizable" >';
+    echo '<div class="panel namespaces">';
     html_msgarea();
-    echo '<div class="mediamanager-tabs">';
-    echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
-    echo '<div class="clearer"></div>';
-    echo '</div>';
-    echo '<div class="background-container">';
+    echo '<h2>'.hsc($lang['namespaces']).'</h2>';
+    echo '<div class="panelHeader">';
     echo hsc($lang['namespaces']);
     echo '</div>';
-    echo '<div class="scroll-container">';
-    tpl_mediaTree();
+
+    echo '<div class="panelContent">';
+    media_nstree($NS);
     echo '</div>';
     echo '</div>';
 
-    echo '<div id="mediamanager__layout_list" class="layout-resizable" >';
+    echo '<div class="panel filelist">';
     tpl_mediaFileList();
     echo '</div>';
 
-    echo '<div id="mediamanager__layout_detail" class="layout" >';
+    echo '<div class="panel file">';
     tpl_mediaFileDetails($image, $rev);
     echo '</div>';
-
-    echo '<div class="clearer"></div>';
-    echo '</div>';
     echo '</div>';
 }
 
-- 
cgit v1.2.3


From e546f04b31e036426fa2202297436fc4208475f3 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 18 Sep 2011 09:55:45 +0200
Subject: Change className from form.actions to form.options

---
 inc/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index ea612ea3f..7999fd255 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -650,7 +650,7 @@ function media_tabs_details($image, $selected_tab = ''){
 function media_tab_files_options(){
     global $lang, $NS;
     $sort = _media_get_sort_type();
-    $form = new Doku_Form(array('class' => 'actions', 'method' => 'get'));
+    $form = new Doku_Form(array('class' => 'options', 'method' => 'get'));
     $form->addHidden('sectok', null);
     $form->addHidden('ns', $NS);
     $form->addHidden('do', 'media');
-- 
cgit v1.2.3


From 90f69556e88c39509172f5926ca29c1ae63e2103 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 10:28:31 +0100
Subject: media manager: re-newed CSS roughly (more to come)

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 58baca111..e2549095c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1513,7 +1513,7 @@ function tpl_media() {
     echo hsc($lang['namespaces']);
     echo '</div>';
 
-    echo '<div class="panelContent">';
+    echo '<div class="panelContent" id="media__tree">';
     media_nstree($NS);
     echo '</div>';
     echo '</div>';
-- 
cgit v1.2.3


From eaac63bb6c71253d7c2d4817c7ffc40cf4f13aeb Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 18 Sep 2011 20:31:08 +0200
Subject: Fix mediamanager JS (diffs not yet working)

---
 inc/media.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 7999fd255..2900f3e4d 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1099,8 +1099,9 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         $difftype = $_REQUEST['difftype'];
 
         if (!$fromajax) {
-            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'method' => 'get'
-            ));
+            $form = new Doku_Form(array('action' => media_managerURL(array(), '&'),
+                                        'method' => 'get',
+                                        'id' => 'mediamanager__form_diffview'));
             $form->addHidden('sectok', null);
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>');
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>');
@@ -1219,10 +1220,10 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
     $r_src = ml($image, $r_more);
 
     // slider
-    echo '<div id="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '<div class="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
 
     // two images in divs
-    echo '<div id="diff_' . $type . '">';
+    echo '<div class="diff_' . $type . '">';
     echo '<div class="image1" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$l_src.'" alt="" />';
     echo '</div>';
-- 
cgit v1.2.3


From c57314fe779ba40a0d3d15fb315b7d6d9acfe730 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 19:47:19 +0100
Subject: media manager: more CSS changes

---
 inc/media.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 7999fd255..bcc5e4400 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1430,7 +1430,6 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         echo '</a>';
     }
     echo '</dt>';
-    //echo '<input type=checkbox />';
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
-- 
cgit v1.2.3


From ba340a70c09e74be51cb8f41531ade7049b6a4fa Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 20:43:58 +0100
Subject: media manager: word changes

---
 inc/lang/en/lang.php | 14 ++++++++------
 inc/template.php     |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index fbfd0e34f..b68ca4730 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -334,6 +334,7 @@ $lang['wordblock']             = 'Your change was not saved because it contains
 
 $lang['media_uploadtab']       = 'Upload';
 $lang['media_searchtab']       = 'Search';
+$lang['media_file']            = 'File';
 $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
@@ -341,12 +342,13 @@ $lang['media_list_thumbs']     = '<span>Show list as</span> thumbnails';
 $lang['media_list_rows']       = '<span>Show list as</span> list';
 $lang['media_sort_name']       = '<span>Sort by</span> name';
 $lang['media_sort_date']       = '<span>Sort by</span> date';
-$lang['media_files']           = 'Media files in the <strong>%s</strong> namespace.';
-$lang['media_upload']          = 'Upload to the <strong>%s</strong> namespace.';
-$lang['media_search']          = 'Search in the <strong>%s</strong> namespace.';
-$lang['media_view']            = '<span class="%s">%s</span>';
-$lang['media_edit']            = 'Edit <span class="%s">%s</span>';
-$lang['media_history']         = 'History of <span class="%s">%s</span>';
+$lang['media_namespaces']      = 'Choose namespace';
+$lang['media_files']           = 'Media files in <strong>%s</strong>';
+$lang['media_upload']          = 'Upload to <strong>%s</strong>';
+$lang['media_search']          = 'Search in <strong>%s</strong>';
+$lang['media_view']            = '<strong class="%s">%s</strong>';
+$lang['media_edit']            = 'Edit <strong class="%s">%s</strong>';
+$lang['media_history']         = 'History of <strong class="%s">%s</strong>';
 $lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
diff --git a/inc/template.php b/inc/template.php
index e2549095c..aeb446b5b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1508,9 +1508,9 @@ function tpl_media() {
 
     echo '<div class="panel namespaces">';
     html_msgarea();
-    echo '<h2>'.hsc($lang['namespaces']).'</h2>';
+    echo '<h2>'.$lang['namespaces'].'</h2>';
     echo '<div class="panelHeader">';
-    echo hsc($lang['namespaces']);
+    echo $lang['media_namespaces'];
     echo '</div>';
 
     echo '<div class="panelContent" id="media__tree">';
@@ -1519,12 +1519,15 @@ function tpl_media() {
     echo '</div>';
 
     echo '<div class="panel filelist">';
+    echo '<h2 class="a11y">'.$lang['mediaselect'].'</h2>';
     tpl_mediaFileList();
     echo '</div>';
 
     echo '<div class="panel file">';
+    echo '<h2 class="a11y">'.$lang['media_file'].'</h2>';
     tpl_mediaFileDetails($image, $rev);
     echo '</div>';
+
     echo '</div>';
 }
 
-- 
cgit v1.2.3


From 699c5072ff1d0470c53299ab9a4dfbb4457e7843 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 00:28:25 +0100
Subject: media manager: small functionality and css changes

---
 inc/html.php     |  9 ++++++---
 inc/media.php    | 27 ++++-----------------------
 inc/template.php |  4 +---
 3 files changed, 11 insertions(+), 29 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 66bc83127..8cf22de82 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1006,8 +1006,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
         $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
         if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
 
+        $l_head_title = ($media) ? dformat($l_rev) : $id.' ['.dformat($l_rev).']';
         $l_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$l_rev").'">'.
-        $id.' ['.dformat($l_rev).']</a>'.
+        $l_head_title.'</a>'.
         '<br />'.$l_user.' '.$l_sum;
     }
 
@@ -1023,8 +1024,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
         $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
         if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
 
+        $r_head_title = ($media) ? dformat($r_rev) : $id.' ['.dformat($r_rev).']';
         $r_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$r_rev").'">'.
-        $id.' ['.dformat($r_rev).']</a>'.
+        $r_head_title.'</a>'.
         '<br />'.$r_user.' '.$r_sum;
     }elseif($_rev = @filemtime($media_or_wikiFN($id))){
         $_info   = getRevisionInfo($id,$_rev,true, $media);
@@ -1038,8 +1040,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
         $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
         if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
 
+        $r_head_title = ($media) ? dformat($_rev) : $id.' ['.dformat($_rev).']';
         $r_head  = '<a class="wikilink1" href="'.$ml_or_wl($id).'">'.
-        $id.' ['.dformat($_rev).']</a> '.
+        $r_head_title.'</a> '.
         '('.$lang['current'].')'.
         '<br />'.$_user.' '.$_sum;
     }else{
diff --git a/inc/media.php b/inc/media.php
index b6ee3cb03..e4beb3115 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -125,12 +125,14 @@ function media_metaform($id,$auth){
         $p['class'] = 'edit';
         $p['id']    = 'meta__'.$key;
         $p['name']  = 'meta['.$field[0].']';
+        $p_attrs    = array('class' => 'edit');
 
         $form->addElement('<div class="row">');
         if($field[2] == 'text'){
-            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class']));
+            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class'], $p_attrs));
         }else{
             $att = buildAttributes($p);
+            $form->addElement('<label for="meta__'.$key.'">'.$lang[$field[1]].'</label>');
             $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
         }
         $form->addElement('</div>');
@@ -853,26 +855,6 @@ function media_preview_buttons($image, $auth, $rev=false) {
 
     echo '<ul class="actions">';
 
-    $more = '';
-    if ($rev) {
-        $more = "rev=$rev";
-    } else {
-        $t = @filemtime(mediaFN($image));
-        $more = "t=$t";
-    }
-    $link = ml($image,$more,true,'&');
-
-    if (@file_exists(mediaFN($image, $rev))) {
-
-        // view original file button
-        $form = new Doku_Form(array('action'=>$link, 'method'=>'get', 'target' => '_blank'));
-        $form->addHidden('sectok', null);
-        $form->addElement(form_makeButton('submit','',$lang['mediaview']));
-        echo '<li>';
-        $form->printForm();
-        echo '</li>';
-    }
-
     if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
 
         // delete button
@@ -1484,12 +1466,11 @@ function media_printimgdetail($item, $fullscreen=false){
             $p['height'] = $h;
         }
         $p['alt']    = $item['id'];
-        $p['class']  = 'thumb';
         $att = buildAttributes($p);
 
         // output
         if ($fullscreen) {
-            echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
+            echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image '.($index ? 'tiny' : 'thumb').'" href="'.
                 media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
             echo '<span><img src="'.$src.'" '.$att.' /></span>';
             echo '</a>';
diff --git a/inc/template.php b/inc/template.php
index aeb446b5b..ffe5b84b4 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,8 +1142,7 @@ function tpl_mediaFileList(){
     if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    // FIXME: define lang
-    echo '<h2 class="a11y">' . sprintf($lang['filelist_desc'], $NS) .  '</h2>';
+    echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>';
 
     media_tabs_files($opened_tab);
 
@@ -1519,7 +1518,6 @@ function tpl_media() {
     echo '</div>';
 
     echo '<div class="panel filelist">';
-    echo '<h2 class="a11y">'.$lang['mediaselect'].'</h2>';
     tpl_mediaFileList();
     echo '</div>';
 
-- 
cgit v1.2.3


From 94add30314d7c0ed51fa78304ca342d0273b366c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 01:22:32 +0100
Subject: media manager: added a few newlines to the output

---
 inc/html.php     |  7 ++---
 inc/media.php    | 93 ++++++++++++++++++++++++++++----------------------------
 inc/template.php | 48 ++++++++++++++---------------
 3 files changed, 73 insertions(+), 75 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 8cf22de82..7f5a46b93 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1830,14 +1830,13 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
 }
 
 function html_tabs($tabs, $current_tab = null) {
-    echo '<ul class="tabs">';
+    echo '<ul class="tabs">'.NL;
 
     foreach($tabs as $id => $tab) {
         html_tab($tab['href'], $tab['caption'], $id === $current_tab);
     }
 
-    echo '</ul>';
-    echo '<div class="clearer"></div>';
+    echo '</ul>'.NL;
 }
 /**
  * Prints a single tab
@@ -1859,7 +1858,7 @@ function html_tab($href, $caption, $selected=false) {
     }
     $tab .= hsc($caption)
          .  '</' . ($selected ? 'strong' : 'a') . '>'
-         .  '</li>';
+         .  '</li>'.NL;
     echo $tab;
 }
 
diff --git a/inc/media.php b/inc/media.php
index e4beb3115..560abc3bc 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -135,11 +135,11 @@ function media_metaform($id,$auth){
             $form->addElement('<label for="meta__'.$key.'">'.$lang[$field[1]].'</label>');
             $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
         }
-        $form->addElement('</div>');
+        $form->addElement('</div>'.NL);
     }
     $form->addElement('<div class="buttons">');
     $form->addElement(form_makeButton('submit', '', $lang['btn_save'], array('accesskey' => 's', 'name' => 'mediado[save]')));
-    $form->addElement('</div>');
+    $form->addElement('</div>'.NL);
     $form->printForm();
 }
 
@@ -578,9 +578,9 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
             if ($fullscreenview) {
                 $view = $_REQUEST['list'];
                 if ($view == 'rows') {
-                    echo '<ul class="rows">';
+                    echo '<ul class="rows">'.NL;
                 } else {
-                    echo '<ul class="thumbs">';
+                    echo '<ul class="thumbs">'.NL;
                 }
             }
             foreach($data as $item){
@@ -590,7 +590,7 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
                     media_printfile_thumbs($item,$auth,$jump);
                 }
             }
-            if ($fullscreenview) echo '</ul>';
+            if ($fullscreenview) echo '</ul>'.NL;
         }
     }
     if (!$fullscreenview) media_searchform($ns);
@@ -656,7 +656,7 @@ function media_tab_files_options(){
     $form->addHidden('sectok', null);
     $form->addHidden('ns', $NS);
     $form->addHidden('do', 'media');
-    $form->addElement('<ul>');
+    $form->addElement('<ul>'.NL);
     foreach(array('list' => array('listType', array('thumbs', 'rows')),
                   'sort' => array('sortBy', array('name', 'date'), $sort))
             as $group => $content) {
@@ -677,12 +677,12 @@ function media_tab_files_options(){
                                                   $content[0] . '__' . $option,
                                                   $option, $attrs));
         }
-        $form->addElement('</li>');
+        $form->addElement('</li>'.NL);
     }
     $form->addElement('<li>');
     $form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
-    $form->addElement('</li>');
-    $form->addElement('</ul>');
+    $form->addElement('</li>'.NL);
+    $form->addElement('</ul>'.NL);
     $form->printForm();
 }
 
@@ -730,12 +730,12 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="upload">';
+    echo '<div class="upload">'.NL;
     if ($auth >= AUTH_UPLOAD) {
         echo '<p>' . $lang['mediaupload'] . '</p>';
     }
     media_uploadform($ns, $auth, true);
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -749,13 +749,13 @@ function media_tab_search($ns,$auth=null) {
     $do = $_REQUEST['mediado'];
     $query = $_REQUEST['q'];
     if (!$query) $query = '';
-    echo '<div class="search">';
+    echo '<div class="search">'.NL;
 
     media_searchform($ns, $query, true);
     if ($do == 'searchlist') {
         media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
     }
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -774,7 +774,7 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
         media_details($image, $auth, $rev, $meta);
 
     } else {
-        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>';
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
 }
 
@@ -821,13 +821,12 @@ function media_tab_history($image, $ns, $auth=null) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_preview($image, $auth, $rev=false, $meta=false) {
-    global $lang;
-
-    echo '<div class="image">';
 
     $size = media_image_preview_size($image, $rev, $meta);
 
     if ($size) {
+        echo '<div class="image">';
+
         $more = array();
         if ($rev) {
             $more['rev'] = $rev;
@@ -840,9 +839,9 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $more['h'] = $size[1];
         $src = ml($image, $more);
         echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />';
-    }
 
-    echo '</div>';
+        echo '</div>'.NL;
+    }
 }
 
 /**
@@ -853,7 +852,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
 function media_preview_buttons($image, $auth, $rev=false) {
     global $lang, $conf;
 
-    echo '<ul class="actions">';
+    echo '<ul class="actions">'.NL;
 
     if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
 
@@ -863,7 +862,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         echo '<li>';
         $form->printForm();
-        echo '</li>';
+        echo '</li>'.NL;
     }
 
     $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
@@ -875,7 +874,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
         echo '<li>';
         $form->printForm();
-        echo '</li>';
+        echo '</li>'.NL;
     }
 
     if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
@@ -888,10 +887,10 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
         echo '<li>';
         $form->printForm();
-        echo '</li>';
+        echo '</li>'.NL;
     }
 
-    echo '</ul>';
+    echo '</ul>'.NL;
 }
 
 /**
@@ -977,17 +976,17 @@ function media_details($image, $auth, $rev=false, $meta=false) {
     if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
     $tags = media_file_tags($meta);
 
-    echo '<dl>';
+    echo '<dl>'.NL;
     foreach($tags as $tag){
         if ($tag['value']) {
             $value = cleanText($tag['value']);
             echo '<dt>'.$lang[$tag['tag'][1]].':</dt><dd>';
             if ($tag['tag'][2] == 'date') echo dformat($value);
             else echo hsc($value);
-            echo '</dd>';
+            echo '</dd>'.NL;
         }
     }
-    echo '</dl>';
+    echo '</dl>'.NL;
 }
 
 /**
@@ -1090,7 +1089,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
             $form->addHidden('mediado', 'diff');
             $form->printForm();
 
-            echo '<div id="mediamanager__diff" >';
+            echo NL.'<div id="mediamanager__diff" >'.NL;
         }
 
         if ($difftype == 'opacity' || $difftype == 'portions') {
@@ -1118,7 +1117,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     echo '<td>';
     media_preview($image, $auth, $r_rev, $r_meta);
     echo '</td>';
-    echo '</tr>';
+    echo '</tr>'.NL;
 
     echo '<tr class="actions">';
     echo '<td>';
@@ -1128,7 +1127,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     echo '<td>';
     media_preview_buttons($image, $auth, $r_rev);
     echo '</td>';
-    echo '</tr>';
+    echo '</tr>'.NL;
 
     $l_tags = media_file_tags($l_meta);
     $r_tags = media_file_tags($r_meta);
@@ -1145,7 +1144,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
 
     echo '<tr>';
     foreach(array($l_tags,$r_tags) as $tags){
-        echo '<td>';
+        echo '<td>'.NL;
 
         echo '<dl class="img_tags">';
         foreach($tags as $tag){
@@ -1163,13 +1162,13 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
             }
             echo '</dd>';
         }
-        echo '</dl>';
+        echo '</dl>'.NL;
 
         echo '</td>';
     }
-    echo '</tr>';
+    echo '</tr>'.NL;
 
-    echo '</table>';
+    echo '</table>'.NL;
 
     if ($is_img && !$fromajax) echo '</div>';
 }
@@ -1298,16 +1297,16 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
         if ($fullscreen) {
             $view = $_REQUEST['view'];
             if ($view == 'list') {
-                echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+                echo '<ul class="mediamanager-list" id="mediamanager__file_list">'.NL;
             } else {
-                echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+                echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">'.NL;
             }
         }
         foreach($evdata['data'] as $item){
             if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
             else media_printfile_thumbs($item,$item['perm'],false,true);
         }
-        if ($fullscreen) echo '</ul>';
+        if ($fullscreen) echo '</ul>'.NL;
     }
 }
 
@@ -1399,7 +1398,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
     $file = utf8_decodeFN($item['file']);
 
     // output
-    echo '<li><dl>';
+    echo '<li><dl>'.NL;
 
         echo '<dt>';
     if($item['isimg']) {
@@ -1412,28 +1411,28 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         echo media_printicon($item['id']);
         echo '</a>';
     }
-    echo '</dt>';
+    echo '</dt>'.NL;
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
         $name = hsc($item['id']);
     }
     echo '<dd class="name"><a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
-        'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>';
+        'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>'.NL;
 
     if($item['isimg']){
         $size = '';
         $size .= (int) $item['meta']->getField('File.Width');
         $size .= '&#215;';
         $size .= (int) $item['meta']->getField('File.Height');
-        echo '<dd class="size">'.$size.'</dd>';
+        echo '<dd class="size">'.$size.'</dd>'.NL;
     } else {
-        echo '<dd class="size">&nbsp;</dd>';
+        echo '<dd class="size">&nbsp;</dd>'.NL;
     }
     $date = dformat($item['mtime']);
-    echo '<dd class="date">'.$date.'</dd>';
+    echo '<dd class="date">'.$date.'</dd>'.NL;
     $filesize = filesize_h($item['size']);
-    echo '<dd class="filesize">'.$filesize.'</dd>';
+    echo '<dd class="filesize">'.$filesize.'</dd>'.NL;
     echo '</dl></li>'.NL;
 }
 
@@ -1592,9 +1591,9 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         $form->addElement(form_makeCloseTag('p'));
     }
 
-    echo '<div id="mediamanager__uploader">';
+    echo NL.'<div id="mediamanager__uploader">'.NL;
     html_form('upload', $form);
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -1611,7 +1610,7 @@ function media_searchform($ns,$query='',$fullscreen=false){
     if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
     else $params['action'] = media_managerURL(array(), '&');
     $form = new Doku_Form($params);
-    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
+    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>'.NL);
     $form->addHidden('ns', $ns);
     if (!$fullscreen) $form->addHidden('do', 'searchlist');
     else $form->addHidden('mediado', 'searchlist');
diff --git a/inc/template.php b/inc/template.php
index ffe5b84b4..77d52fece 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,21 +1142,21 @@ function tpl_mediaFileList(){
     if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>';
+    echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>'.NL;
 
     media_tabs_files($opened_tab);
 
-    echo '<div class="panelHeader">';
+    echo '<div class="panelHeader">'.NL;
     echo '<h3>';
     printf($lang['media_' . $opened_tab],
            hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
-    echo '</h3>';
+    echo '</h3>'.NL;
     if ($opened_tab === 'search' || $opened_tab === 'files') {
         media_tab_files_options();
     }
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '<div class="panelContent">';
+    echo '<div class="panelContent">'.NL;
     if ($opened_tab == 'files') {
         media_tab_files($NS,$AUTH,$JUMPTO);
     } elseif ($opened_tab == 'upload') {
@@ -1164,7 +1164,7 @@ function tpl_mediaFileList(){
     } elseif ($opened_tab == 'search') {
         media_tab_search($NS,$AUTH);
     }
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -1206,9 +1206,9 @@ function tpl_mediaFileDetails($image, $rev){
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
     printf($lang['media_' . $opened_tab], $class, $image);
-    echo '</h3></div>';
+    echo '</h3></div>'.NL;
 
-    echo '<div class="panelContent">';
+    echo '<div class="panelContent">'.NL;
 
     if ($opened_tab == 'view') {
         media_tab_view($image, $NS, $AUTH, $rev);
@@ -1220,7 +1220,7 @@ function tpl_mediaFileDetails($image, $rev){
         media_tab_history($image,$NS,$AUTH);
     }
 
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -1502,31 +1502,31 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<h1>'.$lang['btn_media'].'</h1>';
-    echo '<div id="mediamanager__page">';
-
-    echo '<div class="panel namespaces">';
+    echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
+    echo '<div id="mediamanager__page">'.NL;
     html_msgarea();
-    echo '<h2>'.$lang['namespaces'].'</h2>';
+
+    echo '<div class="panel namespaces">'.NL;
+    echo '<h2>'.$lang['namespaces'].'</h2>'.NL;
     echo '<div class="panelHeader">';
     echo $lang['media_namespaces'];
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '<div class="panelContent" id="media__tree">';
+    echo '<div class="panelContent" id="media__tree">'.NL;
     media_nstree($NS);
-    echo '</div>';
-    echo '</div>';
+    echo '</div>'.NL;
+    echo '</div>'.NL;
 
-    echo '<div class="panel filelist">';
+    echo '<div class="panel filelist">'.NL;
     tpl_mediaFileList();
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '<div class="panel file">';
-    echo '<h2 class="a11y">'.$lang['media_file'].'</h2>';
+    echo '<div class="panel file">'.NL;
+    echo '<h2 class="a11y">'.$lang['media_file'].'</h2>'.NL;
     tpl_mediaFileDetails($image, $rev);
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 026d14a9c6bccdf50efdbf2e662c2ab1b72af2c3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 10:22:06 +0100
Subject: media manager: moved some html out of lang.php and fixed namespace in
 middle panel

---
 inc/lang/en/lang.php | 12 ++++++------
 inc/template.php     |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index b68ca4730..2ee6240b9 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -343,12 +343,12 @@ $lang['media_list_rows']       = '<span>Show list as</span> list';
 $lang['media_sort_name']       = '<span>Sort by</span> name';
 $lang['media_sort_date']       = '<span>Sort by</span> date';
 $lang['media_namespaces']      = 'Choose namespace';
-$lang['media_files']           = 'Media files in <strong>%s</strong>';
-$lang['media_upload']          = 'Upload to <strong>%s</strong>';
-$lang['media_search']          = 'Search in <strong>%s</strong>';
-$lang['media_view']            = '<strong class="%s">%s</strong>';
-$lang['media_edit']            = 'Edit <strong class="%s">%s</strong>';
-$lang['media_history']         = 'History of <strong class="%s">%s</strong>';
+$lang['media_files']           = 'Media files in %s';
+$lang['media_upload']          = 'Upload to %s';
+$lang['media_search']          = 'Search in %s';
+$lang['media_view']            = '%s';
+$lang['media_edit']            = 'Edit %s';
+$lang['media_history']         = 'History of %s';
 $lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
diff --git a/inc/template.php b/inc/template.php
index 77d52fece..718fbd125 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1148,8 +1148,8 @@ function tpl_mediaFileList(){
 
     echo '<div class="panelHeader">'.NL;
     echo '<h3>';
-    printf($lang['media_' . $opened_tab],
-           hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
+    $tabTitle = ($NS) ? $NS : '['.$lang['mediaroot'].']';
+    printf($lang['media_' . $opened_tab], '<strong>'.$tabTitle.'</strong>');
     echo '</h3>'.NL;
     if ($opened_tab === 'search' || $opened_tab === 'files') {
         media_tab_files_options();
@@ -1205,7 +1205,8 @@ function tpl_mediaFileDetails($image, $rev){
     list($ext,$mime,$dl) = mimetype($image,false);
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
-    printf($lang['media_' . $opened_tab], $class, $image);
+    $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>';
+    printf($lang['media_' . $opened_tab], $tabTitle);
     echo '</h3></div>'.NL;
 
     echo '<div class="panelContent">'.NL;
-- 
cgit v1.2.3


From fba0b25db639efd576e78d9a4258de5c8ef916b6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:00:23 +0100
Subject: media manager: improved spacing around option buttons and changed
 lang strings for them

---
 inc/lang/en/lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 2ee6240b9..3a5eb0e9b 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -338,10 +338,10 @@ $lang['media_file']            = 'File';
 $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
-$lang['media_list_thumbs']     = '<span>Show list as</span> thumbnails';
-$lang['media_list_rows']       = '<span>Show list as</span> list';
-$lang['media_sort_name']       = '<span>Sort by</span> name';
-$lang['media_sort_date']       = '<span>Sort by</span> date';
+$lang['media_list_thumbs']     = 'Thumbnails';
+$lang['media_list_rows']       = 'List';
+$lang['media_sort_name']       = 'Name';
+$lang['media_sort_date']       = 'Date';
 $lang['media_namespaces']      = 'Choose namespace';
 $lang['media_files']           = 'Media files in %s';
 $lang['media_upload']          = 'Upload to %s';
-- 
cgit v1.2.3


From add1dac08a50d721dedeb498c12beba09575420f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:02:00 +0100
Subject: media manager: shortened text for media list headline

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 3a5eb0e9b..bfa8920a5 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -343,7 +343,7 @@ $lang['media_list_rows']       = 'List';
 $lang['media_sort_name']       = 'Name';
 $lang['media_sort_date']       = 'Date';
 $lang['media_namespaces']      = 'Choose namespace';
-$lang['media_files']           = 'Media files in %s';
+$lang['media_files']           = 'Files in %s';
 $lang['media_upload']          = 'Upload to %s';
 $lang['media_search']          = 'Search in %s';
 $lang['media_view']            = '%s';
-- 
cgit v1.2.3


From 8db1e1e98b267e53ad82b4ff4bcb4caef24a70c9 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:21:11 +0100
Subject: media manager: renamed List display option to 'Rows'

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index bfa8920a5..25088a40c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -339,7 +339,7 @@ $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
 $lang['media_list_thumbs']     = 'Thumbnails';
-$lang['media_list_rows']       = 'List';
+$lang['media_list_rows']       = 'Rows';
 $lang['media_sort_name']       = 'Name';
 $lang['media_sort_date']       = 'Date';
 $lang['media_namespaces']      = 'Choose namespace';
-- 
cgit v1.2.3


From 8b8998596af1a9dd2d4fcfac9f6b4393fcf69d57 Mon Sep 17 00:00:00 2001
From: Petros Vidalis <pvidalis@gmail.com>
Date: Mon, 19 Sep 2011 13:16:25 +0200
Subject: Greek language update

---
 inc/lang/el/lang.php | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 373dc5463..de8705db9 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -7,6 +7,7 @@
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
+ * @author Petros Vidalis <pvidalis@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,6 +49,8 @@ $lang['btn_recover']           = 'Επαναφορά αυτόματα αποθη
 $lang['btn_draftdel']          = 'Διαγραφή αυτόματα αποθηκευμένης σελίδας';
 $lang['btn_revert']            = 'Αποκατάσταση';
 $lang['btn_register']          = 'Εγγραφή';
+$lang['btn_apply']             = 'Εφαρμογή';
+$lang['btn_media']             = 'Διαχειριστής πολυμέσων';
 $lang['loggedinas']            = 'Συνδεδεμένος ως';
 $lang['user']                  = 'Όνομα χρήστη';
 $lang['pass']                  = 'Κωδικός';
@@ -92,7 +95,7 @@ $lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχεί
 $lang['txt_overwrt']           = 'Αντικατάσταση υπάρχοντος αρχείου';
 $lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
 $lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
-$lang['js']['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
+$lang['js']['willexpire']      = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
 $lang['js']['notsavedyet']     = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.
 Θέλετε να συνεχίσετε;';
 $lang['js']['searchmedia']     = 'Αναζήτηση για αρχεία';
@@ -125,6 +128,17 @@ $lang['js']['linkwiz']         = 'Αυτόματος Οδηγός Συνδέσμ
 $lang['js']['linkto']          = 'Σύνδεση σε:';
 $lang['js']['del_confirm']     = 'Να διαγραφεί;';
 $lang['js']['mu_btn']          = 'Ταυτόχρονη φόρτωση πολλαπλών φακέλων';
+$lang['js']['restore_confirm'] = 'Θέλετε την επαναφορά σε αυτή την έκδοση;';
+$lang['js']['media_diff']      = 'Εμφάνιση διαφορών:';
+$lang['js']['media_diff_both'] = 'Δίπλα δίπλα';
+$lang['js']['media_diff_opacity'] = 'Επικάλυψη';
+$lang['js']['media_diff_portions'] = 'Κύλιση';
+$lang['js']['media_select']    = 'Επιλογή αρχείων...';
+$lang['js']['media_upload_btn'] = 'Φόρτωση';
+$lang['js']['media_done_btn']  = 'Ολοκλήρωση';
+$lang['js']['media_drop']      = 'Ρίξτε αρχεία εδώ για να τα φορτώσετε';
+$lang['js']['media_cancel']    = 'αφαίρεση';
+$lang['js']['media_overwrt']   = 'Αντικατάσταση υπάρχοντων αρχείων';
 $lang['rssfailed']             = 'Παρουσιάστηκε κάποιο σφάλμα κατά την ανάγνωση αυτού του feed: ';
 $lang['nothingfound']          = 'Δεν βρέθηκαν σχετικά αποτελέσματα.';
 $lang['mediaselect']           = 'Επιλογή Αρχείων';
@@ -179,6 +193,10 @@ $lang['mail_changed']          = 'σελίδα τροποποιήθηκε:';
 $lang['mail_subscribe_list']   = 'σελίδες που άλλαξαν στον φάκελο:';
 $lang['mail_new_user']         = 'νέος χρήστης:';
 $lang['mail_upload']           = 'αρχείο φορτώθηκε:';
+$lang['changes_type']          = 'Εμφάνιση αλλαγών του';
+$lang['pages_changes']         = 'Σελίδες';
+$lang['media_changes']         = 'Αρχεία πολυμέσων';
+$lang['both_changes']          = 'Σελίδες και αρχεία πολυμέσων';
 $lang['qb_bold']               = 'Έντονο Κείμενο';
 $lang['qb_italic']             = 'Πλάγιο Κείμενο';
 $lang['qb_underl']             = 'Υπογραμμισμένο Κείμενο';
@@ -219,6 +237,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Camera';
 $lang['img_keywords']          = 'Λέξεις-κλειδιά';
+$lang['img_width']             = 'Πλάτος';
+$lang['img_height']            = 'Ύψος';
+$lang['img_manager']           = 'Εμφάνιση στον διαχειριστή πολυμέσων';
 $lang['subscr_subscribe_success'] = 'Ο/η %s προστέθηκε στην λίστα ειδοποιήσεων για το %s';
 $lang['subscr_subscribe_error'] = 'Σφάλμα κατά την προσθήκη του/της %s στην λίστα ειδοποιήσεων για το %s';
 $lang['subscr_subscribe_noaddress'] = 'Δεν υπάρχει διεύθυνση ταχυδρομείου συσχετισμένη με το όνομα χρήστη σας. Κατά συνέπεια δεν μπορείτε να προστεθείτε στην λίστα ειδοποιήσεων';
@@ -283,4 +304,24 @@ $lang['days']                  = 'πριν %d ημέρες';
 $lang['hours']                 = 'πριν %d ώρες';
 $lang['minutes']               = 'πριν %d λεπτά';
 $lang['seconds']               = 'πριν %d δευτερόλεπτα';
-$lang['wordblock']             = 'Η αλλαγή σας δεν αποθηκεύτηκε γιατί περιείχε spam.';
\ No newline at end of file
+$lang['wordblock']             = 'Η αλλαγή σας δεν αποθηκεύτηκε γιατί περιείχε spam.';
+$lang['media_uploadtab']       = 'Φόρτωση';
+$lang['media_searchtab']       = 'Αναζήτηση';
+$lang['media_viewtab']         = 'Εμφάνιση';
+$lang['media_edittab']         = 'Επεξεργασία';
+$lang['media_historytab']      = 'Ιστορικό';
+$lang['media_thumbsview']      = 'Προεπισκόπιση';
+$lang['media_listview']        = 'Λίστα';
+$lang['media_sort']            = 'Ταξινόμιση';
+$lang['media_sort_name']       = 'ανά όνομα';
+$lang['media_sort_date']       = 'ανά ημερομηνία';
+$lang['media_upload']          = 'Φόρτωση στο <strong>%s</strong> φάκελο.';
+$lang['media_search']          = 'Αναζήτηση στο <strong>%s</strong> φάκελο.';
+$lang['media_edit']            = 'Επεξεργασία';
+$lang['media_history']         = 'Αυτές είναι οι παλαιότερες αναθεωρήσεις του αρχείου.';
+$lang['media_meta_edited']     = 'τα μεταδεδομένα επεξεργάστηκαν';
+$lang['media_perm_read']       = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να διαβάσετε αυτά τα αρχεία.';
+$lang['media_perm_upload']     = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να φορτώσετε αυτά τα αρχεία.';
+$lang['media_update']          = 'Φόρτωση νέας έκδοσης';
+$lang['media_restore']         = 'Επαναφορά αυτή της έκδοσης';
+$lang['plugin_install_err']    = 'Η επέκταση δεν εγκαταστήθηκε σωστά. Μετονομασία φακέλου επεκτάσεων από \'%s\' σε \'%s\'.';
-- 
cgit v1.2.3


From b1ba68599b1aaf3242332cfd97b167f999fd788c Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <robog@gmx.de>
Date: Mon, 19 Sep 2011 13:17:43 +0200
Subject: Esperanto language update

---
 inc/lang/eo/lang.php | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 14bc56405..94bd244ac 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -9,6 +9,7 @@
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Robert Bogenschneider <robog@gmx.de>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Robert BOGENSCHNEIDER <bogi@UEA.org>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -50,6 +51,8 @@ $lang['btn_recover']           = 'Restarigi skizon';
 $lang['btn_draftdel']          = 'Forigi skizon';
 $lang['btn_revert']            = 'Restarigi';
 $lang['btn_register']          = 'Registriĝi';
+$lang['btn_apply']             = 'Apliki';
+$lang['btn_media']             = 'Media-administrilo';
 $lang['loggedinas']            = 'Ensalutita kiel';
 $lang['user']                  = 'Uzant-nomo';
 $lang['pass']                  = 'Pasvorto';
@@ -94,7 +97,7 @@ $lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
 $lang['txt_overwrt']           = 'Anstataŭigi ekzistantan dosieron';
 $lang['lockedby']              = 'Nune ŝlosita de';
 $lang['lockexpire']            = 'Ŝlosado ĉesos en';
-$lang['js']['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
+$lang['js']['willexpire']      = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
 $lang['js']['notsavedyet']     = 'Ne konservitaj modifoj perdiĝos.
 Ĉu vi certe volas daŭrigi la procezon?';
 $lang['js']['searchmedia']     = 'Serĉi dosierojn';
@@ -127,6 +130,17 @@ $lang['js']['linkwiz']         = 'Ligil-Asistanto';
 $lang['js']['linkto']          = 'Ligilo al:';
 $lang['js']['del_confirm']     = 'Ĉu vere forigi elektitajn ero(j)n?';
 $lang['js']['mu_btn']          = 'Alŝuti plurajn dosierojn multope.';
+$lang['js']['restore_confirm'] = 'Ĉu vere restarigi ĉi tiun version?';
+$lang['js']['media_diff']      = 'Rigardu la diferencojn:';
+$lang['js']['media_diff_both'] = 'Flankon apud flanko';
+$lang['js']['media_diff_opacity'] = 'Unu super la alia';
+$lang['js']['media_diff_portions'] = 'Ŝovilo';
+$lang['js']['media_select']    = 'Elektu dosierojn...';
+$lang['js']['media_upload_btn'] = 'Alŝuto';
+$lang['js']['media_done_btn']  = 'Finita';
+$lang['js']['media_drop']      = 'Demetu ĉi-tien por alŝuti';
+$lang['js']['media_cancel']    = 'forigi';
+$lang['js']['media_overwrt']   = 'Anstataûi ekzistantajn dosierojn';
 $lang['rssfailed']             = 'Okazis eraro dum ricevado de la novaĵ-fluo: ';
 $lang['nothingfound']          = 'Ankoraŭ nenio troviĝas tie ĉi.';
 $lang['mediaselect']           = 'Elekto de aŭdvidaĵa dosiero';
@@ -181,6 +195,10 @@ $lang['mail_changed']          = 'paĝo modifita:';
 $lang['mail_subscribe_list']   = 'ŝanĝitaj paĝoj en nomspaco:';
 $lang['mail_new_user']         = 'Nova uzanto:';
 $lang['mail_upload']           = 'dosiero alŝutita:';
+$lang['changes_type']          = 'Rigardi ŝanĝojn de';
+$lang['pages_changes']         = 'Paĝoj';
+$lang['media_changes']         = 'Mediaj dosieroj';
+$lang['both_changes']          = 'Ambaû - paĝojn kaj mediajn dosierojn';
 $lang['qb_bold']               = 'Dika teksto';
 $lang['qb_italic']             = 'Dekliva teksto';
 $lang['qb_underl']             = 'Substrekita teksto';
@@ -221,6 +239,9 @@ $lang['img_copyr']             = 'Kopirajtoj';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Kamerao';
 $lang['img_keywords']          = 'Ŝlosilvortoj';
+$lang['img_width']             = 'Larĝeco';
+$lang['img_height']            = 'Alteco';
+$lang['img_manager']           = 'Rigardi en media-administrilo';
 $lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s';
 $lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s';
 $lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto';
@@ -286,3 +307,23 @@ $lang['hours']                 = 'antaŭ %d horoj';
 $lang['minutes']               = 'antaŭ %d minutoj';
 $lang['seconds']               = 'antaŭ %d sekundoj';
 $lang['wordblock']             = 'Via ŝanĝo ne estis savita, ĉar ĝi enhavas blokitan tekston (spamon).';
+$lang['media_uploadtab']       = 'Alŝuto';
+$lang['media_searchtab']       = 'Serĉo';
+$lang['media_viewtab']         = 'Rigardi';
+$lang['media_edittab']         = 'Modifi';
+$lang['media_historytab']      = 'Historio';
+$lang['media_thumbsview']      = 'Bildetoj';
+$lang['media_listview']        = 'Listigi';
+$lang['media_sort']            = 'Sorti';
+$lang['media_sort_name']       = 'per nomo';
+$lang['media_sort_date']       = 'per dato';
+$lang['media_upload']          = 'Alŝuti al la nomspaco <strong>%s</strong>.';
+$lang['media_search']          = 'Serĉi en la nomspaco <strong>%s</strong>.';
+$lang['media_edit']            = 'Modifi';
+$lang['media_history']         = 'Tiuj estas la pli malnovaj revizioj de la dosiero.';
+$lang['media_meta_edited']     = 'metadatumoj ŝanĝitaj';
+$lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi dosierojn.';
+$lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
+$lang['media_update']          = 'Alŝuti novan version';
+$lang['media_restore']         = 'Restarigi ĉi tiun version';
+$lang['plugin_install_err']    = 'Kromaĵo instalita malĝuste. Renomu la kromaĵan dosierujon \'%s\' al \'%s\'.';
-- 
cgit v1.2.3


From 54a5505521ae2d30ec6348c5350c0adc7466379a Mon Sep 17 00:00:00 2001
From: Otto Vainio <otto@valjakko.net>
Date: Mon, 19 Sep 2011 13:19:11 +0200
Subject: Finnish language update

---
 inc/lang/fi/lang.php | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index a2f2e2027..83d487302 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -49,6 +49,8 @@ $lang['btn_recover']           = 'Palauta luonnos';
 $lang['btn_draftdel']          = 'Poista luonnos';
 $lang['btn_revert']            = 'palauta';
 $lang['btn_register']          = 'Rekisteröidy';
+$lang['btn_apply']             = 'Toteuta';
+$lang['btn_media']             = 'Media manager';
 $lang['loggedinas']            = 'Kirjautunut nimellä';
 $lang['user']                  = 'Käyttäjänimi';
 $lang['pass']                  = 'Salasana';
@@ -93,7 +95,7 @@ $lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
 $lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
 $lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
 $lang['lockexpire']            = 'Lukitus päättyy';
-$lang['js']['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
+$lang['js']['willexpire']      = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
 $lang['js']['notsavedyet']     = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.
  Haluatko varmasti jatkaa?';
 $lang['js']['searchmedia']     = 'Etsi tiedostoja';
@@ -126,6 +128,17 @@ $lang['js']['linkwiz']         = 'Linkkivelho';
 $lang['js']['linkto']          = 'Linkki kohteeseen:';
 $lang['js']['del_confirm']     = 'Haluatko todella poistaa valitut kohteet?';
 $lang['js']['mu_btn']          = 'Lähetä useampia tiedostoja kerralla';
+$lang['js']['restore_confirm'] = 'Haluatko varmasti palauttaa tämän version?';
+$lang['js']['media_diff']      = 'Näytä erot:';
+$lang['js']['media_diff_both'] = 'Vierekkäin';
+$lang['js']['media_diff_opacity'] = 'Päällä';
+$lang['js']['media_diff_portions'] = 'Liukusäädin';
+$lang['js']['media_select']    = 'Valitse tiedostot...';
+$lang['js']['media_upload_btn'] = 'Lähetä';
+$lang['js']['media_done_btn']  = 'Valmis';
+$lang['js']['media_drop']      = 'Pudota lähetettävät tiedostot tähän';
+$lang['js']['media_cancel']    = 'Poista';
+$lang['js']['media_overwrt']   = 'Ylikirjoita olemassa olevat tiedostot';
 $lang['rssfailed']             = 'Virhe tapahtui noudettaessa tätä syötettä: ';
 $lang['nothingfound']          = 'Mitään ei löytynyt.';
 $lang['mediaselect']           = 'Mediatiedoston valinta';
@@ -180,6 +193,10 @@ $lang['mail_changed']          = 'sivu muutettu:';
 $lang['mail_subscribe_list']   = 'muuttuneet sivut nimiavaruudessa:';
 $lang['mail_new_user']         = 'uusi käyttäjä:';
 $lang['mail_upload']           = 'tiedosto lähetetty:';
+$lang['changes_type']          = 'Näytä muutokset:';
+$lang['pages_changes']         = 'Sivut';
+$lang['media_changes']         = 'Mediatiedostot';
+$lang['both_changes']          = 'Sivut ja mediatiedostot';
 $lang['qb_bold']               = 'Lihavoitu teksti';
 $lang['qb_italic']             = 'Kursivoitu teksti';
 $lang['qb_underl']             = 'Alleviivattu teksti';
@@ -220,6 +237,9 @@ $lang['img_copyr']             = 'Tekijänoikeus';
 $lang['img_format']            = 'Formaatti';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Avainsanat';
+$lang['img_width']             = 'Leveys';
+$lang['img_height']            = 'Korkeus';
+$lang['img_manager']           = 'Näytä mediamanagerissa';
 $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
 $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
 $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
@@ -284,3 +304,23 @@ $lang['hours']                 = '%d tuntia sitten';
 $lang['minutes']               = '%d minuuttia sitten';
 $lang['seconds']               = '% sekuntia sitten';
 $lang['wordblock']             = 'Muutostasi ei talletettu, koska se sisältää estettyä tekstiä (spam).';
+$lang['media_uploadtab']       = 'Lähetä';
+$lang['media_searchtab']       = 'Etsi';
+$lang['media_viewtab']         = 'Näytä';
+$lang['media_edittab']         = 'Muokkaa';
+$lang['media_historytab']      = 'Historia';
+$lang['media_thumbsview']      = 'Pikkukuvat';
+$lang['media_listview']        = 'Lista';
+$lang['media_sort']            = 'Järjestä';
+$lang['media_sort_name']       = 'nimen mukaan';
+$lang['media_sort_date']       = 'päivämäärän mukaan';
+$lang['media_upload']          = 'Lähetä <strong>%s</strong> nimiavaruuteen';
+$lang['media_search']          = 'Etsi <strong>%s</strong> nimiavaruudesta';
+$lang['media_edit']            = 'Muokkaa';
+$lang['media_history']         = 'Nämä ovat vanhat versiot tiedostosta.';
+$lang['media_meta_edited']     = 'Metadataa muokattu';
+$lang['media_perm_read']       = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lukeaksesi tiedostoja.';
+$lang['media_perm_upload']     = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.';
+$lang['media_update']          = 'Lähetä uusi versio';
+$lang['media_restore']         = 'Palauta tämä versio';
+$lang['plugin_install_err']    = 'Liitännäinen asentui virheellisesti. Nimeä liitännäisen hakemisto \'%s\' -> \'%s\'';
-- 
cgit v1.2.3


From f84d2dfd6f3df6ad2403af497075b0bb35393ffc Mon Sep 17 00:00:00 2001
From: Thomas Nygreen <nygreen@gmail.com>
Date: Mon, 19 Sep 2011 13:20:27 +0200
Subject: Norwegian language update

---
 inc/lang/no/adminplugins.txt  |  2 +-
 inc/lang/no/lang.php          | 56 ++++++++++++++++++++++++++++++++++++++++---
 inc/lang/no/newpage.txt       |  2 +-
 inc/lang/no/norev.txt         |  4 ++--
 inc/lang/no/subscr_digest.txt | 20 ++++++++++++++++
 inc/lang/no/subscr_form.txt   |  3 +++
 inc/lang/no/subscr_list.txt   | 17 +++++++++++++
 inc/lang/no/subscr_single.txt | 23 ++++++++++++++++++
 inc/lang/no/updateprofile.txt |  2 +-
 inc/lang/no/uploadmail.txt    |  1 +
 10 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 inc/lang/no/subscr_digest.txt
 create mode 100644 inc/lang/no/subscr_form.txt
 create mode 100644 inc/lang/no/subscr_list.txt
 create mode 100644 inc/lang/no/subscr_single.txt

(limited to 'inc')

diff --git a/inc/lang/no/adminplugins.txt b/inc/lang/no/adminplugins.txt
index 32499a2e4..091ae4d7e 100644
--- a/inc/lang/no/adminplugins.txt
+++ b/inc/lang/no/adminplugins.txt
@@ -1 +1 @@
-====== Ekstra tilleggene ======
\ No newline at end of file
+====== Ekstra tillegg ======
\ No newline at end of file
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index fa946ca02..7ed5902ca 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -19,8 +19,8 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“';
-$lang['doublequoteclosing']    = '”';
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '\'';
@@ -57,6 +57,8 @@ $lang['btn_recover']           = 'Gjennvinn kladd';
 $lang['btn_draftdel']          = 'Slett kladd';
 $lang['btn_revert']            = 'Gjenopprette';
 $lang['btn_register']          = 'Registrer deg';
+$lang['btn_apply']             = 'Bruk';
+$lang['btn_media']             = 'Mediefiler';
 $lang['loggedinas']            = 'Innlogget som';
 $lang['user']                  = 'Brukernavn';
 $lang['pass']                  = 'Passord';
@@ -101,7 +103,7 @@ $lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Stengt av';
 $lang['lockexpire']            = 'Avstengningen opphører';
-$lang['js']['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['js']['willexpire']      = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
 $lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt.
 Vil du fortsette?';
 $lang['js']['searchmedia']     = 'Søk for filer';
@@ -134,6 +136,16 @@ $lang['js']['linkwiz']         = 'guide til lenker';
 $lang['js']['linkto']          = 'Lenke til:';
 $lang['js']['del_confirm']     = 'Slett denne oppføringen?';
 $lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
+$lang['js']['restore_confirm'] = 'Er du sikker på at du vil gjenopprette denne versjonen?';
+$lang['js']['media_diff']      = 'Vis forskjeller:';
+$lang['js']['media_diff_both'] = 'Side ved side:';
+$lang['js']['media_diff_portions'] = 'Glidebryter';
+$lang['js']['media_select']    = 'Velg filer…';
+$lang['js']['media_upload_btn'] = 'Last opp';
+$lang['js']['media_done_btn']  = 'Ferdig';
+$lang['js']['media_drop']      = 'Dra filer hit for å laste dem opp';
+$lang['js']['media_cancel']    = 'fjern';
+$lang['js']['media_overwrt']   = 'Erstatt eksisterende filer';
 $lang['rssfailed']             = 'En feil oppstod da denne kilden skulle hentes:';
 $lang['nothingfound']          = 'Ingen data funnet.';
 $lang['mediaselect']           = 'Valg av mediafil';
@@ -169,6 +181,7 @@ $lang['diff']                  = 'Vis forskjeller mot nåværende versjon';
 $lang['diff2']                 = 'Vis forskjeller mellom valgte versjoner';
 $lang['difflink']              = 'Lenk til denne sammenligningen';
 $lang['diff_type']             = 'Vis forskjeller:';
+$lang['diff_inline']           = 'I teksten';
 $lang['diff_side']             = 'Side ved side';
 $lang['line']                  = 'Linje';
 $lang['breadcrumb']            = 'Spor';
@@ -187,6 +200,10 @@ $lang['mail_changed']          = 'side endret:';
 $lang['mail_subscribe_list']   = 'side endret i \'namespace\':';
 $lang['mail_new_user']         = 'ny bruker:';
 $lang['mail_upload']           = 'fil opplastet:';
+$lang['changes_type']          = 'Vis endringer av';
+$lang['pages_changes']         = 'Sider';
+$lang['media_changes']         = 'Mediefiler';
+$lang['both_changes']          = 'Både sider og mediefiler';
 $lang['qb_bold']               = 'Fet tekst';
 $lang['qb_italic']             = 'Kursiv tekst';
 $lang['qb_underl']             = 'Understreket tekst';
@@ -227,12 +244,25 @@ $lang['img_copyr']             = 'Opphavsrett';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Nøkkelord';
+$lang['img_width']             = 'Bredde';
+$lang['img_height']            = 'Høyde';
+$lang['img_manager']           = 'Vis i mediefilbehandler';
+$lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s';
+$lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s';
+$lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.';
+$lang['subscr_unsubscribe_success'] = 'Avsluttet %s sitt abonnement på %s';
+$lang['subscr_unsubscribe_error'] = 'Klarte ikke å avslutte %s sitt abonnement på %s';
+$lang['subscr_already_subscribed'] = '%s abonnerer allerede på %s';
+$lang['subscr_not_subscribed'] = '%s abonnerer ikke på %s';
+$lang['subscr_m_not_subscribed'] = 'Du abonnerer ikke på denne sida eller dette navnerommet';
 $lang['subscr_m_new_header']   = 'Legg til abonnement';
 $lang['subscr_m_current_header'] = 'Gjeldende abonnementer';
 $lang['subscr_m_unsubscribe']  = 'Avmeld';
 $lang['subscr_m_subscribe']    = 'Påmeld';
 $lang['subscr_m_receive']      = 'Motta';
 $lang['subscr_style_every']    = 'e-post for alle endringer';
+$lang['subscr_style_digest']   = 'e-post med sammendrag av endringer for hver side (%.2f dager mellom hver)';
+$lang['subscr_style_list']     = 'liste med sider som er endra siden forrige e-post (%.2f dager mellom hver)';
 $lang['authmodfailed']         = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
 $lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
 $lang['i_chooselang']          = 'Velg ditt språk';
@@ -285,3 +315,23 @@ $lang['hours']                 = '%d timer siden';
 $lang['minutes']               = '%d minutter siden';
 $lang['seconds']               = '%d sekunder siden';
 $lang['wordblock']             = 'Din endring ble ikke lagret ettersom den inneholder blokkert tekst (søppel).';
+$lang['media_uploadtab']       = 'Last opp';
+$lang['media_searchtab']       = 'Søk';
+$lang['media_viewtab']         = 'Vis';
+$lang['media_edittab']         = 'Rediger';
+$lang['media_historytab']      = 'Historikk';
+$lang['media_thumbsview']      = 'Miniatyrbilder';
+$lang['media_listview']        = 'Liste';
+$lang['media_sort']            = 'Sorter';
+$lang['media_sort_name']       = 'etter navn';
+$lang['media_sort_date']       = 'etter dato';
+$lang['media_upload']          = 'Last opp til navnerommet <strong>%s</strong>.';
+$lang['media_search']          = 'Søk i navnerommet <strong>%s</strong>.';
+$lang['media_edit']            = 'Rediger';
+$lang['media_history']         = 'Dette er de tidligere versjonene av fila.';
+$lang['media_meta_edited']     = 'metadata er endra';
+$lang['media_perm_read']       = 'Beklager, du har ikke tilgang til å lese filer.';
+$lang['media_perm_upload']     = 'Beklager, du har ikke tilgang til å laste opp filer.';
+$lang['media_update']          = 'Last opp ny versjon';
+$lang['media_restore']         = 'Gjenopprett denne versjonen';
+$lang['plugin_install_err']    = 'Tillegget ble feil installert. Skift navn på mappa \'%s\' til \'%s\'.';
diff --git a/inc/lang/no/newpage.txt b/inc/lang/no/newpage.txt
index 8f4b8da79..f712998d2 100644
--- a/inc/lang/no/newpage.txt
+++ b/inc/lang/no/newpage.txt
@@ -1,3 +1,3 @@
-====== Det fins ikke noe innhold ======
+====== Dette emnet har ikke noe innhold ======
 
 Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan skape det gjennom å klikke på ''**Lag denne siden**''.
diff --git a/inc/lang/no/norev.txt b/inc/lang/no/norev.txt
index dfd71db0f..cc58c99e3 100644
--- a/inc/lang/no/norev.txt
+++ b/inc/lang/no/norev.txt
@@ -1,4 +1,4 @@
-====== Det fins ingen slik versjon ======
+====== Versjonen finnes ikke ======
 
-Den angitte versjonen fins ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som fins av dette dokumentet.
+Den angitte versjonen finnes ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som finnes av dette dokumentet.
 
diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt
new file mode 100644
index 000000000..3192e43b7
--- /dev/null
+++ b/inc/lang/no/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hei!
+
+Sida @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Gammel versjon : @OLDPAGE@
+Ny versjon: @NEWPAGE@
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@ og gå til 
+@NEWPAGE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/subscr_form.txt b/inc/lang/no/subscr_form.txt
new file mode 100644
index 000000000..c3df69e02
--- /dev/null
+++ b/inc/lang/no/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Administrere abonnement ======
+
+Denne sida lar deg administrere abonnementene dine for denne sida og dette navnerommet.
\ No newline at end of file
diff --git a/inc/lang/no/subscr_list.txt b/inc/lang/no/subscr_list.txt
new file mode 100644
index 000000000..72cd307cb
--- /dev/null
+++ b/inc/lang/no/subscr_list.txt
@@ -0,0 +1,17 @@
+Hei!
+
+Sider i navnerommet @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@ og gå til 
+@NEWPAGE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt
new file mode 100644
index 000000000..ce117b952
--- /dev/null
+++ b/inc/lang/no/subscr_single.txt
@@ -0,0 +1,23 @@
+Hei!
+
+Sida @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Bruker : @USER@
+Sammendrag: @SUMMARY@
+Gammel versjon : @OLDPAGE@
+Ny versjon: @NEWPAGE@
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@, gå til 
+@NEWPAGE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/updateprofile.txt b/inc/lang/no/updateprofile.txt
index 5565e528f..b2e37e76d 100644
--- a/inc/lang/no/updateprofile.txt
+++ b/inc/lang/no/updateprofile.txt
@@ -1,5 +1,5 @@
 ====== Oppdater din brukerprofil ======
 
-Du behøver bare fylle ut de felter du ønsker å endre. Du kan ikke endre ditt brukernavn.
+Du behøver bare fylle ut de felter du ønsker å endre. Du kan ikke endre brukernavnet ditt.
 
 
diff --git a/inc/lang/no/uploadmail.txt b/inc/lang/no/uploadmail.txt
index b01905009..2890d962d 100644
--- a/inc/lang/no/uploadmail.txt
+++ b/inc/lang/no/uploadmail.txt
@@ -1,6 +1,7 @@
 En fil ble lastet opp på din DokuWiki. Her er detaljene:
 
 Fil : @MEDIA@
+Gammel versjon: @OLD@
 Dato : @DATE@
 Nettleser : @BROWSER@
 IP-adresse : @IPADDRESS@
-- 
cgit v1.2.3


From 86e64c1709dfad1edceb5b0b2acdaade3b248d96 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Mon, 19 Sep 2011 13:41:40 +0200
Subject: Simplified Chinese language update

---
 inc/lang/zh/lang.php | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 31e6dc238..4328d10ce 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -13,6 +13,7 @@
  * @author caii <zhoucaiqi@gmail.com>
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
+ * @author lainme993@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -54,6 +55,8 @@ $lang['btn_recover']           = '恢复草稿';
 $lang['btn_draftdel']          = '删除草稿';
 $lang['btn_revert']            = '恢复';
 $lang['btn_register']          = '注册';
+$lang['btn_apply']             = '应用';
+$lang['btn_media']             = '媒体管理器';
 $lang['loggedinas']            = '登录为';
 $lang['user']                  = '用户名';
 $lang['pass']                  = '密码';
@@ -98,7 +101,7 @@ $lang['txt_filename']          = '上传并重命名为（可选）';
 $lang['txt_overwrt']           = '覆盖已存在的同名文件';
 $lang['lockedby']              = '目前已被下列人员锁定';
 $lang['lockexpire']            = '预计锁定解除于';
-$lang['js']['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
+$lang['js']['willexpire']      = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
 $lang['js']['notsavedyet']     = '未保存的更改将丢失。
 真的要继续？';
 $lang['js']['searchmedia']     = '查找文件';
@@ -131,6 +134,17 @@ $lang['js']['linkwiz']         = '链接向导';
 $lang['js']['linkto']          = '链接到：';
 $lang['js']['del_confirm']     = '真的要删除选中的项目吗？';
 $lang['js']['mu_btn']          = '一次上传了多个文件';
+$lang['js']['restore_confirm'] = '确实要恢复这个版本么？';
+$lang['js']['media_diff']      = '查看差异：';
+$lang['js']['media_diff_both'] = '肩并肩';
+$lang['js']['media_diff_opacity'] = '叠加';
+$lang['js']['media_diff_portions'] = '滑块';
+$lang['js']['media_select']    = '选择文件……';
+$lang['js']['media_upload_btn'] = '上传';
+$lang['js']['media_done_btn']  = '完成';
+$lang['js']['media_drop']      = '拖拽文件到此处来上传';
+$lang['js']['media_cancel']    = '删除';
+$lang['js']['media_overwrt']   = '覆盖已存在的文件';
 $lang['rssfailed']             = '获取该 RSS 信息时产生错误：';
 $lang['nothingfound']          = '什么都没有找到。';
 $lang['mediaselect']           = '媒体文件';
@@ -185,6 +199,10 @@ $lang['mail_changed']          = '更改页面：';
 $lang['mail_subscribe_list']   = '命名空间中改变的页面：';
 $lang['mail_new_user']         = '新用户：';
 $lang['mail_upload']           = '已上传的文件：';
+$lang['changes_type']          = '查看何种更改';
+$lang['pages_changes']         = '页面';
+$lang['media_changes']         = '媒体文件';
+$lang['both_changes']          = '页面和媒体文件';
 $lang['qb_bold']               = '粗体';
 $lang['qb_italic']             = '斜体';
 $lang['qb_underl']             = '下划线';
@@ -225,6 +243,9 @@ $lang['img_copyr']             = '版权';
 $lang['img_format']            = '格式';
 $lang['img_camera']            = '相机';
 $lang['img_keywords']          = '关键字';
+$lang['img_width']             = '宽度';
+$lang['img_height']            = '高度';
+$lang['img_manager']           = '在媒体管理器中查看';
 $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
 $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
 $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表';
@@ -293,3 +314,23 @@ $lang['hours']                 = '%d小时前';
 $lang['minutes']               = '%d分钟前';
 $lang['seconds']               = '%d秒前';
 $lang['wordblock']             = '您的更改没有被保存，因为它包含被屏蔽的文字（垃圾信息）。';
+$lang['media_uploadtab']       = '上传';
+$lang['media_searchtab']       = '搜索';
+$lang['media_viewtab']         = '查看';
+$lang['media_edittab']         = '编辑';
+$lang['media_historytab']      = '历史';
+$lang['media_thumbsview']      = '缩略图';
+$lang['media_listview']        = '列表';
+$lang['media_sort']            = '排序';
+$lang['media_sort_name']       = '按名称';
+$lang['media_sort_date']       = '按日期';
+$lang['media_upload']          = '上传到 <strong>%s</strong> 命名空间。';
+$lang['media_search']          = '在 <strong>%s</strong> 命名空间中搜索。';
+$lang['media_edit']            = '编辑';
+$lang['media_history']         = '这些是文件的旧版本。';
+$lang['media_meta_edited']     = '元数据已编辑';
+$lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文件。';
+$lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';
+$lang['media_update']          = '上传新版本';
+$lang['media_restore']         = '恢复这个版本';
+$lang['plugin_install_err']    = '插件安装不正确。重命名插件目录“%s”为“%s”。';
-- 
cgit v1.2.3


From 0831741370e6589c76c19869e8f11c114a944f0c Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Mon, 19 Sep 2011 16:07:09 +0200
Subject: Add file revision above file detail page

---
 inc/lang/en/lang.php | 1 +
 inc/template.php     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 25088a40c..92c7185b2 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -347,6 +347,7 @@ $lang['media_files']           = 'Files in %s';
 $lang['media_upload']          = 'Upload to %s';
 $lang['media_search']          = 'Search in %s';
 $lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s at %s';
 $lang['media_edit']            = 'Edit %s';
 $lang['media_history']         = 'History of %s';
 $lang['media_meta_edited']     = 'metadata edited';
diff --git a/inc/template.php b/inc/template.php
index 718fbd125..891c2e143 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1206,7 +1206,11 @@ function tpl_mediaFileDetails($image, $rev){
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
     $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>';
-    printf($lang['media_' . $opened_tab], $tabTitle);
+    if ($opened_tab === 'view' && $rev) {
+        printf($lang['media_viewold'], $tabTitle, dformat($rev));
+    } else {
+        printf($lang['media_' . $opened_tab], $tabTitle);
+    }
     echo '</h3></div>'.NL;
 
     echo '<div class="panelContent">'.NL;
-- 
cgit v1.2.3


From bc314c5832351325feac48564dae39a93321d99a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 20 Sep 2011 10:47:46 +0100
Subject: media manager: improved the panel widths

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 891c2e143..b56d6c718 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1507,8 +1507,8 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
     echo '<div id="mediamanager__page">'.NL;
+    echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
     html_msgarea();
 
     echo '<div class="panel namespaces">'.NL;
-- 
cgit v1.2.3