From 8d40b4b6e74029367996c169aa3e67507a4cdfe1 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 5 Jun 2011 21:05:23 +0300
Subject: type of recent changes selection

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index b9b3951ff..d2d66220c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -89,7 +89,8 @@ function tpl_content_core(){
                 $_REQUEST['first'] = $_REQUEST['first'][0];
             }
             $first = is_numeric($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
-            html_recent($first);
+            $show_changes = $_REQUEST['show_changes'];
+            html_recent($first, $show_changes);
             break;
         case 'index':
             html_index($IDX); #FIXME can this be pulled from globals? is it sanitized correctly?
-- 
cgit v1.2.3


From d9162c6cd87643d7e7af8e37cd93aa48b8aecb96 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 9 Jun 2011 14:04:50 +0300
Subject: fullscreen media manager

---
 inc/template.php | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 3 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index d2d66220c..4bbb501fc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -123,6 +123,9 @@ function tpl_content_core(){
         case 'subscribe':
             tpl_subscribe();
             break;
+        case 'media':
+            tpl_media();
+            break;
         default:
             $evt = new Doku_Event('TPL_ACT_UNKNOWN',$ACT);
             if ($evt->advise_before())
@@ -1123,6 +1126,56 @@ function tpl_mediaContent($fromajax=false){
 
 }
 
+/**
+ * Prints the central column in full-screen media manager
+ * Depending on the opened tab this may be a list of
+ * files in a namespace, upload form or search form
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function tpl_fileList(){
+    global $AUTH;
+    global $NS;
+    global $JUMPTO;
+
+    $opened_tab = $_REQUEST['tab_files'];
+    if (!$opened_tab) $opened_tab = 'files';
+
+    media_tabs_files($opened_tab);
+    if ($opened_tab == 'files') media_tab_files($NS,$AUTH,$JUMPTO);
+    if ($opened_tab == 'upload') media_tab_upload($NS,$AUTH,$JUMPTO);
+    if ($opened_tab == 'search') media_tab_search($NS,$AUTH);
+
+}
+
+/**
+ * Prints the third column in full-screen media manager
+ * Depending on the opened tab this may be details of the
+ * selected file, the meta editing dialog or
+ * list of file revisions
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function tpl_fileDetails(){
+    global $AUTH;
+    global $NS;
+    global $IMG;
+
+    $opened_tab = $_REQUEST['tab_details'];
+    if (!$opened_tab) $opened_tab = 'view';
+    if ($_REQUEST['edit']) $opened_tab = 'edit';
+    media_tabs_details($opened_tab);
+
+    $image = $_REQUEST['image'];
+    if (!$image && !$IMG) return false;
+    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
+    if ($opened_tab == 'edit') {
+        if ($IMG) media_tab_edit($IMG, $NS, $AUTH);
+        else if ($image) media_tab_edit($image, $NS, $AUTH);
+    }
+    if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
+}
+
 /**
  * prints the namespace tree in the mediamanger popup
  *
@@ -1130,10 +1183,10 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_mediaTree(){
+function tpl_mediaTree($fullscreen = false){
     global $NS;
-
-    ptln('<div id="media__tree">');
+    if ($fullscreen) ptln('<div id="media-menu">');
+    else ptln('<div id="media__tree">');
     media_nstree($NS);
     ptln('</div>');
 }
@@ -1359,6 +1412,36 @@ function tpl_getFavicon($abs=false) {
     return DOKU_TPL.'images/favicon.ico';
 }
 
+/**
+ * Prints full-screen media manager
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function tpl_media() {
+    //
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO;
+    require_once(DOKU_INC.'lib/exe/mediamanager.php');
+
+    echo '<div class="mediamanager" id="id-mediamanager">';
+    echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
+    echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
+    html_msgarea();
+    echo hsc('Namespaces:');
+    echo '<br /><br />';
+    echo '<div class="scroll-container">';
+    tpl_mediaTree(true);
+    echo '</div>';
+    echo '</div>';
+    echo '<div id="id-mediamanager-layout-list" class="layout" style="width: 40%;">';
+    tpl_fileList();
+    echo '</div>';
+    echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
+    tpl_fileDetails();
+    echo '</div>';
+    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '</div>';
+    echo '</div>';
+}
 
 //Setup VIM: ex: et ts=4 :
 
-- 
cgit v1.2.3


From 1eeeced2339756132a78e5f1893cb3677c0f6529 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 15 Jun 2011 18:09:26 +0300
Subject: media manager fixes

---
 inc/template.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 4bbb501fc..1fb5490f5 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1161,13 +1161,14 @@ function tpl_fileDetails(){
     global $NS;
     global $IMG;
 
+    $image = $_REQUEST['image'];
+    if (!isset($IMG) && !isset($image)) return '';
+
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     media_tabs_details($opened_tab);
 
-    $image = $_REQUEST['image'];
-    if (!$image && !$IMG) return false;
     if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
     if ($opened_tab == 'edit') {
         if ($IMG) media_tab_edit($IMG, $NS, $AUTH);
-- 
cgit v1.2.3


From b9eb2e61ea959c1f8b3a5c58ad50a0f9c8c855ad Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 20 Jun 2011 10:51:48 +0300
Subject: media manager button

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 1fb5490f5..31320c876 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -630,6 +630,8 @@ function tpl_get_action($type) {
             // Superseded by subscribe/subscription
             return '';
             break;
+        case 'media':
+            break;
         default:
             return '[unknown %s type]';
             break;
-- 
cgit v1.2.3


From 030dd1d963bb7a0ab824b823d777a58fc105b1e5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 20 Jun 2011 19:16:09 +0300
Subject: thumbnails and list view

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 31320c876..69ed61f7e 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1441,7 +1441,7 @@ function tpl_media() {
     echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
     tpl_fileDetails();
     echo '</div>';
-    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '<div class="clearer"></div>';
     echo '</div>';
     echo '</div>';
 }
-- 
cgit v1.2.3


From 6b467722ce67ad489326798250cc5312efa70dcd Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 22 Jun 2011 23:16:31 +0300
Subject: mediamanager fixes

---
 inc/template.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 69ed61f7e..5d29f6950 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1163,8 +1163,9 @@ function tpl_fileDetails(){
     global $NS;
     global $IMG;
 
-    $image = $_REQUEST['image'];
+    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
     if (!isset($IMG) && !isset($image)) return '';
+    if (isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
@@ -1422,15 +1423,20 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
     echo '<div class="mediamanager" id="id-mediamanager">';
     echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
     echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
     html_msgarea();
-    echo hsc('Namespaces:');
-    echo '<br /><br />';
+    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 hsc($lang['namespaces']);
+    echo '</div>';
     echo '<div class="scroll-container">';
     tpl_mediaTree(true);
     echo '</div>';
-- 
cgit v1.2.3


From 88a71175e3de9e3ad8b20ca9eb710aaf773cb788 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 23 Jun 2011 14:16:15 +0300
Subject: media manager auth fix

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 5d29f6950..051679fb9 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1423,7 +1423,8 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang, $fullscreen;
+    $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
     echo '<div class="mediamanager" id="id-mediamanager">';
-- 
cgit v1.2.3


From 70c3cc9a17d47d8986cba0805d943c1a68af1740 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 24 Jun 2011 00:41:47 +0300
Subject: media action buttons

---
 inc/template.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 051679fb9..4226c0e52 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,6 +1142,7 @@ function tpl_fileList(){
 
     $opened_tab = $_REQUEST['tab_files'];
     if (!$opened_tab) $opened_tab = 'files';
+    if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
     media_tabs_files($opened_tab);
     if ($opened_tab == 'files') media_tab_files($NS,$AUTH,$JUMPTO);
@@ -1161,11 +1162,9 @@ function tpl_fileList(){
 function tpl_fileDetails(){
     global $AUTH;
     global $NS;
-    global $IMG;
 
     if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
-    if (!isset($IMG) && !isset($image)) return '';
-    if (isset($NS) && getNS($image) != $NS) return '';
+    if (!isset($image) || isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
@@ -1173,10 +1172,7 @@ function tpl_fileDetails(){
     media_tabs_details($opened_tab);
 
     if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
-    if ($opened_tab == 'edit') {
-        if ($IMG) media_tab_edit($IMG, $NS, $AUTH);
-        else if ($image) media_tab_edit($image, $NS, $AUTH);
-    }
+    if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
     if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
 }
 
-- 
cgit v1.2.3


From 98f03b57e3bb6185cbbb815a71d254e28df79912 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 29 Jun 2011 17:04:16 +0300
Subject: media upload fix

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 4226c0e52..e3d716c25 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1159,17 +1159,17 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails(){
+function tpl_fileDetails($image){
     global $AUTH;
     global $NS;
 
-    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
-    if (!isset($image) || isset($NS) && getNS($image) != $NS) return '';
+    if (!$image || !file_exists(mediaFN($image))) return '';
+    if (isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
-    media_tabs_details($opened_tab);
+    media_tabs_details($image, $opened_tab);
 
     if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
     if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
@@ -1423,6 +1423,10 @@ function tpl_media() {
     $fullscreen = true;
     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;
+
     echo '<div class="mediamanager" id="id-mediamanager">';
     echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
     echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
@@ -1442,7 +1446,7 @@ function tpl_media() {
     tpl_fileList();
     echo '</div>';
     echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
-    tpl_fileDetails();
+    tpl_fileDetails($image);
     echo '</div>';
     echo '<div class="clearer"></div>';
     echo '</div>';
-- 
cgit v1.2.3


From 9c1bd4bc9aa4b9ac3b9981543a14508091cd639a Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 30 Jun 2011 19:44:31 +0300
Subject: restoring old media revisions

---
 inc/template.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index e3d716c25..cb5004891 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1159,11 +1159,12 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image){
+function tpl_fileDetails($image, $rev){
     global $AUTH;
     global $NS;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
+    if ($rev && !file_exists(mediaFN($image, $rev))) return '';
     if (isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
@@ -1171,7 +1172,7 @@ function tpl_fileDetails($image){
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     media_tabs_details($image, $opened_tab);
 
-    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
+    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH, $rev);
     if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
     if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
 }
@@ -1419,13 +1420,14 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang, $fullscreen;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen;
     $fullscreen = true;
     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 class="mediamanager" id="id-mediamanager">';
     echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
@@ -1446,7 +1448,7 @@ function tpl_media() {
     tpl_fileList();
     echo '</div>';
     echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
-    tpl_fileDetails($image);
+    tpl_fileDetails($image, $rev);
     echo '</div>';
     echo '<div class="clearer"></div>';
     echo '</div>';
-- 
cgit v1.2.3


From 23846a98488bec2aaade6d983b4c0b0db13af80c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 3 Jul 2011 19:00:54 +0300
Subject: ajax mediamanager

---
 inc/template.php | 55 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 14 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index cb5004891..c3b705421 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1135,7 +1135,7 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileList(){
+function tpl_fileList($fromajax=false){
     global $AUTH;
     global $NS;
     global $JUMPTO;
@@ -1144,10 +1144,23 @@ function tpl_fileList(){
     if (!$opened_tab) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    media_tabs_files($opened_tab);
-    if ($opened_tab == 'files') media_tab_files($NS,$AUTH,$JUMPTO);
-    if ($opened_tab == 'upload') media_tab_upload($NS,$AUTH,$JUMPTO);
-    if ($opened_tab == 'search') media_tab_search($NS,$AUTH);
+    if(!$fromajax) media_tabs_files($opened_tab);
+
+    if ($opened_tab == 'files') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
+        media_tab_files($NS,$AUTH,$JUMPTO);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'upload') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
+        media_tab_upload($NS,$AUTH,$JUMPTO);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'search') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
+        media_tab_search($NS,$AUTH);
+        if (!$fromajax) echo '</div>';
+    }
 
 }
 
@@ -1159,22 +1172,37 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image, $rev){
+function tpl_fileDetails($image, $rev, $fromajax=false){
     global $AUTH;
     global $NS;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) return '';
     if (isset($NS) && getNS($image) != $NS) return '';
+    $do = $_REQUEST['mediado'];
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
-    media_tabs_details($image, $opened_tab);
+    if ($do == 'restore') $opened_tab = 'view';
 
-    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH, $rev);
-    if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
-    if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
+    if(!$fromajax) media_tabs_details($image, $opened_tab);
+
+    if ($opened_tab == 'view') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
+        media_tab_view($image, $NS, $AUTH, $rev);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'edit') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
+        media_tab_edit($image, $NS, $AUTH);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'history') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
+        media_tab_history($image,$NS,$AUTH);
+        if (!$fromajax) echo '</div>';
+    }
 }
 
 /**
@@ -1186,8 +1214,7 @@ function tpl_fileDetails($image, $rev){
  */
 function tpl_mediaTree($fullscreen = false){
     global $NS;
-    if ($fullscreen) ptln('<div id="media-menu">');
-    else ptln('<div id="media__tree">');
+    ptln('<div id="media__tree">');
     media_nstree($NS);
     ptln('</div>');
 }
@@ -1444,10 +1471,10 @@ function tpl_media() {
     tpl_mediaTree(true);
     echo '</div>';
     echo '</div>';
-    echo '<div id="id-mediamanager-layout-list" class="layout" style="width: 40%;">';
+    echo '<div id="mediamanager__layout_list" class="layout" style="width: 40%;">';
     tpl_fileList();
     echo '</div>';
-    echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
+    echo '<div id="mediamanager__layout_detail" class="layout" style="width: 30%;">';
     tpl_fileDetails($image, $rev);
     echo '</div>';
     echo '<div class="clearer"></div>';
-- 
cgit v1.2.3


From ed69a2ae06c0707fdd5634e18d569c25f0cda6d5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 3 Jul 2011 23:56:26 +0300
Subject: ajax mediamanager fix

---
 inc/template.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index c3b705421..70253bb90 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1135,7 +1135,7 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileList($fromajax=false){
+function tpl_fileList(){
     global $AUTH;
     global $NS;
     global $JUMPTO;
@@ -1144,22 +1144,22 @@ function tpl_fileList($fromajax=false){
     if (!$opened_tab) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    if(!$fromajax) media_tabs_files($opened_tab);
+    media_tabs_files($opened_tab);
 
     if ($opened_tab == 'files') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
+        echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
         media_tab_files($NS,$AUTH,$JUMPTO);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'upload') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
+        echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
         media_tab_upload($NS,$AUTH,$JUMPTO);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'search') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
+        echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
         media_tab_search($NS,$AUTH);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
     }
 
 }
@@ -1172,7 +1172,7 @@ function tpl_fileList($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image, $rev, $fromajax=false){
+function tpl_fileDetails($image, $rev){
     global $AUTH;
     global $NS;
 
@@ -1186,22 +1186,22 @@ function tpl_fileDetails($image, $rev, $fromajax=false){
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     if ($do == 'restore') $opened_tab = 'view';
 
-    if(!$fromajax) media_tabs_details($image, $opened_tab);
+    media_tabs_details($image, $opened_tab);
 
     if ($opened_tab == 'view') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
+        echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
         media_tab_view($image, $NS, $AUTH, $rev);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'edit') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
+        echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'history') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
+        echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
     }
 }
 
-- 
cgit v1.2.3


From fa8e5c7713944541c907aea2b81c6a44382a15f0 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 17 Jul 2011 18:42:43 +0300
Subject: mediamanager html, css reworking

---
 inc/template.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 81b3795ac..13cec438c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1146,17 +1146,17 @@ function tpl_fileList(){
     media_tabs_files($opened_tab);
 
     if ($opened_tab == 'files') {
-        echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
+        echo '<div id="mediamanager__files">';
         media_tab_files($NS,$AUTH,$JUMPTO);
         echo '</div>';
 
     } elseif ($opened_tab == 'upload') {
-        echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
+        echo '<div id="mediamanager__files">';
         media_tab_upload($NS,$AUTH,$JUMPTO);
         echo '</div>';
 
     } elseif ($opened_tab == 'search') {
-        echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
+        echo '<div id="mediamanager__files">';
         media_tab_search($NS,$AUTH);
         echo '</div>';
     }
@@ -1188,17 +1188,17 @@ function tpl_fileDetails($image, $rev){
     media_tabs_details($image, $opened_tab);
 
     if ($opened_tab == 'view') {
-        echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
+        echo '<div id="mediamanager__details">';
         media_tab_view($image, $NS, $AUTH, $rev);
         echo '</div>';
 
     } elseif ($opened_tab == 'edit') {
-        echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
+        echo '<div id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
         echo '</div>';
 
     } elseif ($opened_tab == 'history') {
-        echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
+        echo '<div id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
         echo '</div>';
     }
@@ -1211,7 +1211,7 @@ function tpl_fileDetails($image, $rev){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_mediaTree($fullscreen = false){
+function tpl_mediaTree(){
     global $NS;
     ptln('<div id="media__tree">');
     media_nstree($NS);
@@ -1456,8 +1456,9 @@ function tpl_media() {
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
     echo '<div class="mediamanager" id="id-mediamanager">';
-    echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
-    echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
+    echo '<div id="mediamanager__layout">';
+
+    echo '<div id="mediamanager__layout_namespaces" class="layout resizable" >';
     html_msgarea();
     echo '<div class="mediamanager-tabs">';
     echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
@@ -1467,15 +1468,18 @@ function tpl_media() {
     echo hsc($lang['namespaces']);
     echo '</div>';
     echo '<div class="scroll-container">';
-    tpl_mediaTree(true);
+    tpl_mediaTree();
     echo '</div>';
     echo '</div>';
-    echo '<div id="mediamanager__layout_list" class="layout" style="width: 40%;">';
+
+    echo '<div id="mediamanager__layout_list" class="layout resizable" >';
     tpl_fileList();
     echo '</div>';
-    echo '<div id="mediamanager__layout_detail" class="layout" style="width: 30%;">';
+
+    echo '<div id="mediamanager__layout_detail" class="layout" >';
     tpl_fileDetails($image, $rev);
     echo '</div>';
+
     echo '<div class="clearer"></div>';
     echo '</div>';
     echo '</div>';
-- 
cgit v1.2.3


From 80291f9e4256d8bd01f0b0a0589aab2ea402ab64 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 18 Jul 2011 16:51:47 +0300
Subject: mediamanager resize

---
 inc/template.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 13cec438c..2a840a01b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1455,10 +1455,10 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<div class="mediamanager" id="id-mediamanager">';
+    echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
-    echo '<div id="mediamanager__layout_namespaces" class="layout resizable" >';
+    echo '<div id="mediamanager__layout_namespaces" class="layout-resizable" >';
     html_msgarea();
     echo '<div class="mediamanager-tabs">';
     echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
@@ -1472,7 +1472,7 @@ function tpl_media() {
     echo '</div>';
     echo '</div>';
 
-    echo '<div id="mediamanager__layout_list" class="layout resizable" >';
+    echo '<div id="mediamanager__layout_list" class="layout-resizable" >';
     tpl_fileList();
     echo '</div>';
 
-- 
cgit v1.2.3


From 6dd095f599ed20044f98d324cda37bedd57b3d3e Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 2 Aug 2011 19:15:11 +0300
Subject: issue #10 media revisions/changes in RSS feed

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 2a840a01b..a48a099e0 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1176,7 +1176,7 @@ function tpl_fileDetails($image, $rev){
     global $NS;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
-    if ($rev && !file_exists(mediaFN($image, $rev))) return '';
+    if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
 
-- 
cgit v1.2.3


From e5d185e17e613b7a9737fc76310f1e78008f71ec Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 2 Aug 2011 20:25:17 +0300
Subject: issue #9 config option to disable media revisions, auth

---
 inc/template.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index a48a099e0..e6673c3f3 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1140,7 +1140,7 @@ function tpl_fileList(){
     global $JUMPTO;
 
     $opened_tab = $_REQUEST['tab_files'];
-    if (!$opened_tab) $opened_tab = 'files';
+    if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
     media_tabs_files($opened_tab);
@@ -1172,8 +1172,7 @@ function tpl_fileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_fileDetails($image, $rev){
-    global $AUTH;
-    global $NS;
+    global $AUTH, $NS, $conf;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
@@ -1181,7 +1180,17 @@ function tpl_fileDetails($image, $rev){
     $do = $_REQUEST['mediado'];
 
     $opened_tab = $_REQUEST['tab_details'];
-    if (!$opened_tab) $opened_tab = 'view';
+
+    $tab_array = array('view');
+    list($ext, $mime) = mimetype($image);
+    if ($mime == 'image/jpeg') {
+        $tab_array[] = 'edit';
+    }
+    if ($conf['mediarevisions']) {
+        $tab_array[] = 'history';
+    }
+
+    if (!$opened_tab || !in_array($opened_tab, $tab_array)) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     if ($do == 'restore') $opened_tab = 'view';
 
@@ -1197,7 +1206,7 @@ function tpl_fileDetails($image, $rev){
         media_tab_edit($image, $NS, $AUTH);
         echo '</div>';
 
-    } elseif ($opened_tab == 'history') {
+    } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
         echo '</div>';
@@ -1446,7 +1455,7 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf;
     $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
-- 
cgit v1.2.3


From 92cac9a97ee63d9c3c9bb8b0da1e3eb0604ba04f Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 3 Aug 2011 15:19:52 +0300
Subject: issue #38 diff links only if diff available; deleted files

---
 inc/template.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index e6673c3f3..04e3e79cc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1174,7 +1174,8 @@ function tpl_fileList(){
 function tpl_fileDetails($image, $rev){
     global $AUTH, $NS, $conf;
 
-    if (!$image || !file_exists(mediaFN($image))) return '';
+    $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
@@ -1201,7 +1202,7 @@ function tpl_fileDetails($image, $rev){
         media_tab_view($image, $NS, $AUTH, $rev);
         echo '</div>';
 
-    } elseif ($opened_tab == 'edit') {
+    } elseif ($opened_tab == 'edit' && !$removed) {
         echo '<div id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
         echo '</div>';
-- 
cgit v1.2.3


From 96a7ba82ad21ad7bd7cd5f677d85042da7733605 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 18:48:19 +0300
Subject: issue #56 ajax deleting images

---
 inc/template.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 04e3e79cc..d5320c5dd 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1172,10 +1172,10 @@ function tpl_fileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_fileDetails($image, $rev){
-    global $AUTH, $NS, $conf;
+    global $AUTH, $NS, $conf, $DEL;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
-    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return '';
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
@@ -1209,7 +1209,7 @@ function tpl_fileDetails($image, $rev){
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
-        media_tab_history($image,$NS,$AUTH);
+        media_tab_history($image,$NS,$AUTH,$removed);
         echo '</div>';
     }
 }
@@ -1465,6 +1465,7 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
+    echo '<div id="test"></div>';
     echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
-- 
cgit v1.2.3


From 10799f9c522a9847ebf5f2f7c91d4af7f160e4b8 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 21:11:04 +0300
Subject: issue #44 removing drop-area after upload

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index d5320c5dd..569e211b1 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1209,7 +1209,7 @@ function tpl_fileDetails($image, $rev){
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
-        media_tab_history($image,$NS,$AUTH,$removed);
+        media_tab_history($image,$NS,$AUTH);
         echo '</div>';
     }
 }
@@ -1465,7 +1465,6 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<div id="test"></div>';
     echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
-- 
cgit v1.2.3


From 035e07f1301d5d7a13de017640d80db14d300ac3 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 24 Aug 2011 22:34:06 +0300
Subject: issue #57, function names, params, html fixes

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 569e211b1..c0c83d640 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1134,7 +1134,7 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileList(){
+function tpl_mediaFileList(){
     global $AUTH;
     global $NS;
     global $JUMPTO;
@@ -1171,7 +1171,7 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image, $rev){
+function tpl_mediaFileDetails($image, $rev){
     global $AUTH, $NS, $conf, $DEL;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
@@ -1483,11 +1483,11 @@ function tpl_media() {
     echo '</div>';
 
     echo '<div id="mediamanager__layout_list" class="layout-resizable" >';
-    tpl_fileList();
+    tpl_mediaFileList();
     echo '</div>';
 
     echo '<div id="mediamanager__layout_detail" class="layout" >';
-    tpl_fileDetails($image, $rev);
+    tpl_mediaFileDetails($image, $rev);
     echo '</div>';
 
     echo '<div class="clearer"></div>';
-- 
cgit v1.2.3


From 30fd72fbc3c8bd3fbcae4f7041aa0e001a719c6a Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 2 Sep 2011 14:50:19 +0300
Subject: issue #47 Changes to old media manager popup: removing edit and
 delete functionality

---
 inc/template.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 0dfc5a526..37c31e328 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1109,9 +1109,7 @@ function tpl_mediaContent($fromajax=false){
     $evt = new Doku_Event('MEDIAMANAGER_CONTENT_OUTPUT', $data);
     if ($evt->advise_before()) {
         $do = $data['do'];
-        if($do == 'metaform'){
-            media_metaform($IMG,$AUTH);
-        }elseif($do == 'filesinuse'){
+        if($do == 'filesinuse'){
             media_filesinuse($INUSE,$IMG);
         }elseif($do == 'filelist'){
             media_filelist($NS,$AUTH,$JUMPTO);
-- 
cgit v1.2.3


From 812c5e8caaef8afdeb000439ec99404f7a83e681 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Sep 2011 16:17:30 +0100
Subject: media manager design: added headline

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

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 37c31e328..96e0668c2 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1493,6 +1493,7 @@ function tpl_media() {
     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__layout_namespaces" class="layout-resizable" >';
-- 
cgit v1.2.3