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

---
 lib/tpl/default/design.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 1fdf2bfac..029a5525c 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -246,6 +246,18 @@ div.dokuwiki div.pagenav-next {
     width: 49%
 }
 
+/* ----------- type of recent changes ------------- */
+
+div.dokuwiki div.changestypenav {
+    border-bottom: 1px solid #8CACBB;
+    padding-bottom: 10px;
+    margin-bottom: 10px;
+}
+
+div.dokuwiki div.changestypenav label {
+    padding-right: 10px;
+}
+
 /* --------------- Links ------------------ */
 
 div.dokuwiki a:link,
-- 
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

---
 lib/tpl/default/style.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index c5b2c31a5..bc28d1bbc 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -15,6 +15,7 @@ _mediaoptions.css = screen
 _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
+mediamanager.css  = screen
 
 rtl.css        = rtl
 print.css      = print
-- 
cgit v1.2.3


From 8e69fd30702f1101a9c70dbe6eac6f45f9af3970 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 13 Jun 2011 20:23:18 +0300
Subject: media manager

---
 lib/tpl/default/mediamanager.css | 155 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 lib/tpl/default/mediamanager.css

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
new file mode 100644
index 000000000..2001bc5f9
--- /dev/null
+++ b/lib/tpl/default/mediamanager.css
@@ -0,0 +1,155 @@
+.float-image {
+    float: left;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    width: 100px;
+    height: 180px;
+    background-color: #DEE7EC;
+    padding: 10px;
+    text-align: center;
+}
+
+.float-image:hover {
+    background-color: #dadada;
+}
+
+/* --- Tree formatting --- */
+
+#media-menu img {
+    float: left;
+    padding: 0.5em 0.3em 0 0;
+}
+
+#media-menu ul {
+    list-style-type: none;
+    list-style-image: none;
+    margin-left: 1.5em;
+}
+
+#media-menu li {
+    clear: left;
+    list-style-type: none;
+    list-style-image: none;
+}
+
+/* -------------- */
+
+.mediamanager {
+    width: 100%;
+    overflow-y: auto;
+}
+
+.mediamanager .mediamanager-slider {
+    width: auto;
+}
+
+.mediamanager .mediamanager-slider .layout {
+    float: left;
+    margin-left: 5px;
+    margin-right: 5px;
+}
+
+.mediamanager .scroll-container {
+    /*height: 0px;*/
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 0;
+    margin: 0;
+}
+
+.background-container {
+    background-color: #DEE7EC;
+    margin-bottom: 10px;
+    padding: 10px;
+    text-align: left;
+}
+
+.mediamanager-link-thumbnails {
+    background: url('icon-thumb.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: block;
+    float: left;
+    /*width: 0;*/
+    /*overflow: hidden;*/
+}
+
+.mediamanager-link-list {
+    background: url('icon-list.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: block;
+    float: left;
+    /*width: 0;*/
+    /*overflow: hidden;*/
+}
+
+.mediamanager-block-sort {
+    background: url('icon-sort.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: block;
+    float: right;
+}
+
+.mediamanager-link-thumbnails:hover,
+.mediamanager-link-list:hover {
+    width: auto;
+    margin-right: 10px;
+}
+
+.mediamanager-clear {
+    clear: both;
+    line-height: 0;
+    font-size: 0;
+}
+
+.mediamanager-link-upload {
+    background: url('icon-upload.png') 0 -4px no-repeat;
+    padding-left: 30px;
+}
+
+.mediamanager-link-search {
+    background: url('icon-search.png') 0 -4px no-repeat;
+    padding-left: 30px;
+}
+
+.mediamanager-tabs a {
+    font-weight: bold;
+    display: block;
+    float: left;
+    padding: 10px;
+    padding-bottom: 5px;
+    padding-top: 5px;
+
+    margin-right: 2px;
+
+    -moz-border-radius-topright: 10px;
+    -webkit-border-top-right-radius: 10px;
+    -moz-border-radius-topleft: 10px;
+    -webkit-border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    border-top-left-radius: 10px;
+}
+
+.mediamanager-tabs .selected {
+    background-color: #DEE7EC;
+}
+
+.mediamanager-tabs a:hover {
+    background-color: #DEE7EC;
+    opacity: 0.5;
+}
+
+.mediamanager-table td {
+    padding: 5px;
+}
+
+.mediamanager-table tr:nth-child(2n+1){
+    background-color: #f5f5f5;
+}
+
+.mediamanager-table {
+   background: expression(this.rowIndex % 2 == 0 ? "#ffffff" : "#f5f5f5");
+}
+
+.mediamanager-table tr:hover {
+    background-color: #DEE7EC;
+}
\ No newline at end of file
-- 
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

---
 lib/tpl/default/mediamanager.css | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 2001bc5f9..bf4513f0c 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -152,4 +152,11 @@
 
 .mediamanager-table tr:hover {
     background-color: #DEE7EC;
-}
\ No newline at end of file
+}
+
+form.meta textarea.edit {
+    height: 8em;
+    width: 95%;
+    min-width: 95%;
+    max-width: 95%;
+}
-- 
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

---
 lib/tpl/default/main.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 94c2322aa..698793ecd 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -117,6 +117,7 @@ if (!defined('DOKU_INC')) die();
       </div>
       <div class="bar-right" id="bar__bottomright">
         <?php tpl_button('subscribe')?>
+        <?php tpl_button('media')?>
         <?php tpl_button('admin')?>
         <?php tpl_button('profile')?>
         <?php tpl_button('login')?>
-- 
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

---
 lib/tpl/default/design.css       |   2 +-
 lib/tpl/default/mediamanager.css | 110 ++++++++++++++++++++++++---------------
 2 files changed, 68 insertions(+), 44 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 029a5525c..1dee4dc69 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -249,7 +249,7 @@ div.dokuwiki div.pagenav-next {
 /* ----------- type of recent changes ------------- */
 
 div.dokuwiki div.changestypenav {
-    border-bottom: 1px solid #8CACBB;
+    border-bottom: 1px solid __border__;
     padding-bottom: 10px;
     margin-bottom: 10px;
 }
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index bf4513f0c..25816e273 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,18 +1,3 @@
-.float-image {
-    float: left;
-    margin-right: 10px;
-    margin-bottom: 10px;
-    width: 100px;
-    height: 180px;
-    background-color: #DEE7EC;
-    padding: 10px;
-    text-align: center;
-}
-
-.float-image:hover {
-    background-color: #dadada;
-}
-
 /* --- Tree formatting --- */
 
 #media-menu img {
@@ -55,35 +40,36 @@
     overflow-x: hidden;
     padding: 0;
     margin: 0;
+    text-align: left;
 }
 
 .background-container {
-    background-color: #DEE7EC;
+    background-color: __background_alt__;
     margin-bottom: 10px;
     padding: 10px;
     text-align: left;
 }
 
 .mediamanager-link-thumbnails {
-    background: url('icon-thumb.png') 0 -4px no-repeat;
+    background: url('/lib/images/icon-thumb.png') 0 -4px no-repeat;
     padding-left: 30px;
     display: block;
     float: left;
-    /*width: 0;*/
-    /*overflow: hidden;*/
+    width: 0;
+    overflow: hidden;
 }
 
 .mediamanager-link-list {
-    background: url('icon-list.png') 0 -4px no-repeat;
+    background: url('/lib/images/icon-list.png') 0 -4px no-repeat;
     padding-left: 30px;
     display: block;
     float: left;
-    /*width: 0;*/
-    /*overflow: hidden;*/
+    width: 0;
+    overflow: hidden;
 }
 
 .mediamanager-block-sort {
-    background: url('icon-sort.png') 0 -4px no-repeat;
+    background: url('/lib/images/icon-sort.png') 0 -4px no-repeat;
     padding-left: 30px;
     display: block;
     float: right;
@@ -95,22 +81,6 @@
     margin-right: 10px;
 }
 
-.mediamanager-clear {
-    clear: both;
-    line-height: 0;
-    font-size: 0;
-}
-
-.mediamanager-link-upload {
-    background: url('icon-upload.png') 0 -4px no-repeat;
-    padding-left: 30px;
-}
-
-.mediamanager-link-search {
-    background: url('icon-search.png') 0 -4px no-repeat;
-    padding-left: 30px;
-}
-
 .mediamanager-tabs a {
     font-weight: bold;
     display: block;
@@ -130,11 +100,11 @@
 }
 
 .mediamanager-tabs .selected {
-    background-color: #DEE7EC;
+    background-color: __background_alt__;
 }
 
 .mediamanager-tabs a:hover {
-    background-color: #DEE7EC;
+    background-color: __background_alt__;
     opacity: 0.5;
 }
 
@@ -143,7 +113,7 @@
 }
 
 .mediamanager-table tr:nth-child(2n+1){
-    background-color: #f5f5f5;
+    background-color: __background_neu__;
 }
 
 .mediamanager-table {
@@ -151,7 +121,7 @@
 }
 
 .mediamanager-table tr:hover {
-    background-color: #DEE7EC;
+    background-color: __background_alt__;
 }
 
 form.meta textarea.edit {
@@ -160,3 +130,57 @@ form.meta textarea.edit {
     min-width: 95%;
     max-width: 95%;
 }
+
+.mediamanager-file-list {
+    padding: 0;
+    margin: 0 !important;
+}
+
+.mediamanager-thumbs li {
+    width: 100px;
+    min-height: 130px;
+    display: inline-block;
+    margin: 0;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    background-color: __background_alt__;
+    padding: 10px;
+    vertical-align: top;
+    display: -moz-inline-stack;
+    text-align: center;
+}
+
+.mediamanager-thumbs li .info {
+    display: block;
+}
+
+.mediamanager-list li {
+    display: block;
+    margin-bottom: 3px;
+}
+
+.mediamanager-list li:nth-child(2n+1) {
+    background-color: __background_neu__;
+}
+
+.mediamanager-list li .image {
+    width: 50px;
+    height: 50px;
+    overflow: hidden;
+    float: left;
+}
+
+.mediamanager-list li .image img {
+    width: 100%;
+}
+
+.mediamanager-list li .info {
+    overflow: hidden;
+    float: left;
+    margin-left: 5px;
+    width: 20%;
+}
+
+.mediamanager-file-list li:hover {
+    background-color: #dadada;
+}
-- 
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

---
 lib/tpl/default/mediamanager.css | 79 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 7 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 25816e273..e7c78dbcf 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -24,6 +24,11 @@
     overflow-y: auto;
 }
 
+.mediamanager .clearer {
+    font-size: 0;
+    line-height: 0;
+}
+
 .mediamanager .mediamanager-slider {
     width: auto;
 }
@@ -51,7 +56,7 @@
 }
 
 .mediamanager-link-thumbnails {
-    background: url('/lib/images/icon-thumb.png') 0 -4px no-repeat;
+    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
     padding-left: 30px;
     display: block;
     float: left;
@@ -60,7 +65,7 @@
 }
 
 .mediamanager-link-list {
-    background: url('/lib/images/icon-list.png') 0 -4px no-repeat;
+    background: url('../../images/icon-list.png') 0 -4px no-repeat;
     padding-left: 30px;
     display: block;
     float: left;
@@ -69,7 +74,7 @@
 }
 
 .mediamanager-block-sort {
-    background: url('/lib/images/icon-sort.png') 0 -4px no-repeat;
+    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
     padding-left: 30px;
     display: block;
     float: right;
@@ -148,14 +153,44 @@ form.meta textarea.edit {
     vertical-align: top;
     display: -moz-inline-stack;
     text-align: center;
+    zoom: 1;
+    *display: inline;
+    _height: 130px;
+    position: relative;
+}
+
+.mediamanager-thumbs li .image {
+    width: 100%;
+    height: 90px;
+    display: block;
+    overflow: hidden;
 }
 
 .mediamanager-thumbs li .info {
     display: block;
+    overflow: hidden;
+}
+
+.mediamanager-thumbs li input[type=checkbox] {
+    /*position: absolute;
+    left: 100%;
+    top: 100%;
+    margin-left: -20px;
+    margin-top: -20px;*/
+    display: none;
+}
+
+.mediamanager-thumbs li:hover input[type=checkbox],
+.mediamanager-thumbs li input[type=checkbox]:checked {
+    display: inline;
 }
 
 .mediamanager-list li {
+    list-style: none;
     display: block;
+    position: relative;
+    max-height: 50px;
+    margin: 0;
     margin-bottom: 3px;
 }
 
@@ -164,10 +199,11 @@ form.meta textarea.edit {
 }
 
 .mediamanager-list li .image {
-    width: 50px;
-    height: 50px;
+    width: 10%;
+    display: block;
     overflow: hidden;
     float: left;
+    height: 40px;
 }
 
 .mediamanager-list li .image img {
@@ -177,10 +213,39 @@ form.meta textarea.edit {
 .mediamanager-list li .info {
     overflow: hidden;
     float: left;
-    margin-left: 5px;
-    width: 20%;
+    width: 19%;
+    margin-left: 1%;
+}
+
+.mediamanager-list li input[type=checkbox] {
+    position: absolute;
+    left: 100%;
+    margin-left: -20px;
+    margin-top: 3px;
+    display: none;
+}
+
+.mediamanager-list li:hover input[type=checkbox],
+.mediamanager-list li input[type=checkbox]:checked {
+    display: block;
 }
 
 .mediamanager-file-list li:hover {
     background-color: #dadada;
 }
+
+.mediamanager-table-50 {
+    padding: 0;
+    margin: 0 !important;
+}
+
+.mediamanager-table-50 li {
+    width: 48%;
+    display: inline-block;
+    margin: 0;
+    margin-bottom: 10px;
+    padding: 2px;
+    vertical-align: top;
+    zoom: 1;
+    *display: inline;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 532850ed047e0f35268eb1a5d4cf85c80f228dc5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 23 Jun 2011 13:13:34 +0300
Subject: media getting metadata fix

---
 lib/tpl/default/detail.php | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index 4f42b116e..f61ede043 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -52,30 +52,28 @@ if (!defined('DOKU_INC')) die();
 
       <dl class="img_tags">
         <?php
-          $t = tpl_img_getTag('Date.EarliestTime');
-          if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
-
-          $t = tpl_img_getTag('File.Name');
-          if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
-
-          $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'));
-          if($t) print '<dt>'.$lang['img_artist'].':</dt><dd>'.hsc($t).'</dd>';
-
-          $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'));
-          if($t) print '<dt>'.$lang['img_copyr'].':</dt><dd>'.hsc($t).'</dd>';
-
-          $t = tpl_img_getTag('File.Format');
-          if($t) print '<dt>'.$lang['img_format'].':</dt><dd>'.hsc($t).'</dd>';
-
-          $t = tpl_img_getTag('File.NiceSize');
-          if($t) print '<dt>'.$lang['img_fsize'].':</dt><dd>'.hsc($t).'</dd>';
-
-          $t = tpl_img_getTag('Simple.Camera');
-          if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>';
-
-          $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
-          if($t) print '<dt>'.$lang['img_keywords'].':</dt><dd>'.hsc($t).'</dd>';
-
+            static $tags = null;
+            if(is_null($tags)){
+                foreach (array('default','local') as $config_group) {
+                    if (empty($config_cascade['mediameta'][$config_group])) continue;
+                    foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
+                        if(@file_exists($config_file)){
+                            include($config_file);
+                        }
+                    }
+                }
+            }
+            foreach($tags as $key => $tag){
+                $t = $tag[0];
+                if (!is_array($t)) $t = array($tag[0]);
+                $value = tpl_img_getTag($t);
+                if ($value) {
+                    echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
+                    if ($tag[2] == 'text') echo hsc($value);
+                    if ($tag[2] == 'date') echo dformat($value);
+                    echo '</dd>';
+                }
+            }
         ?>
       </dl>
       <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
-- 
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

---
 lib/tpl/default/mediamanager.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e7c78dbcf..7a85f3c8b 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -248,4 +248,8 @@ form.meta textarea.edit {
     vertical-align: top;
     zoom: 1;
     *display: inline;
+}
+
+.mediamanager-preview {
+    margin-bottom: 5px;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 322111f0870d88a59b71258ce8410ae378441533 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 28 Jun 2011 15:52:02 +0300
Subject: css fix

---
 lib/tpl/default/mediamanager.css | 48 +++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 20 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 7a85f3c8b..cceecf7fe 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -24,11 +24,6 @@
     overflow-y: auto;
 }
 
-.mediamanager .clearer {
-    font-size: 0;
-    line-height: 0;
-}
-
 .mediamanager .mediamanager-slider {
     width: auto;
 }
@@ -154,10 +149,15 @@ form.meta textarea.edit {
     display: -moz-inline-stack;
     text-align: center;
     zoom: 1;
-    *display: inline;
-    _height: 130px;
     position: relative;
 }
+* html .mediamanager-thumbs li {
+    display: inline;
+}
+*+html .mediamanager-thumbs li {
+    display: inline;
+    _height: 130px;
+}
 
 .mediamanager-thumbs li .image {
     width: 100%;
@@ -166,23 +166,23 @@ form.meta textarea.edit {
     overflow: hidden;
 }
 
-.mediamanager-thumbs li .info {
+.mediamanager-thumbs li .name,
+.mediamanager-thumbs li .size,
+.mediamanager-thumbs li .filesize,
+.mediamanager-thumbs li .date {
     display: block;
     overflow: hidden;
 }
 
 .mediamanager-thumbs li input[type=checkbox] {
-    /*position: absolute;
-    left: 100%;
-    top: 100%;
-    margin-left: -20px;
-    margin-top: -20px;*/
     display: none;
+    float: left;
+    margin: 3px;
 }
 
 .mediamanager-thumbs li:hover input[type=checkbox],
 .mediamanager-thumbs li input[type=checkbox]:checked {
-    display: inline;
+    display: block;
 }
 
 .mediamanager-list li {
@@ -210,19 +210,25 @@ form.meta textarea.edit {
     width: 100%;
 }
 
-.mediamanager-list li .info {
+.mediamanager-list li .name,
+.mediamanager-list li .size,
+.mediamanager-list li .filesize
+.mediamanager-list li .date {
     overflow: hidden;
     float: left;
     width: 19%;
     margin-left: 1%;
 }
 
+.mediamanager-list li .date,
+.mediamanager-thumbs li .date {
+    font-style: italic;
+}
+
 .mediamanager-list li input[type=checkbox] {
-    position: absolute;
-    left: 100%;
-    margin-left: -20px;
-    margin-top: 3px;
     display: none;
+    float: left;
+    margin: 3px;
 }
 
 .mediamanager-list li:hover input[type=checkbox],
@@ -247,7 +253,9 @@ form.meta textarea.edit {
     padding: 2px;
     vertical-align: top;
     zoom: 1;
-    *display: inline;
+}
+* html .mediamanager-table-50 li {
+    display: inline;
 }
 
 .mediamanager-preview {
-- 
cgit v1.2.3


From 3e98e6857f2c48127d4169d02e341d1013c00bac Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 29 Jun 2011 16:59:18 +0300
Subject: media getting metadata fix

---
 lib/tpl/default/detail.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index f61ede043..f7bb37a25 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -52,25 +52,20 @@ if (!defined('DOKU_INC')) die();
 
       <dl class="img_tags">
         <?php
-            static $tags = null;
-            if(is_null($tags)){
-                foreach (array('default','local') as $config_group) {
-                    if (empty($config_cascade['mediameta'][$config_group])) continue;
-                    foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
-                        if(@file_exists($config_file)){
-                            include($config_file);
-                        }
-                    }
-                }
+            $config_files = getConfigFiles('mediameta');
+            foreach ($config_files as $config_file) {
+                if(@file_exists($config_file)) include($config_file);
             }
-            foreach($tags as $key => $tag){
-                $t = $tag[0];
-                if (!is_array($t)) $t = array($tag[0]);
+
+            foreach($fields as $key => $tag){
+                $t = array();
+                if (!empty($tag[0])) $t = array($tag[0]);
+                if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
                 $value = tpl_img_getTag($t);
                 if ($value) {
                     echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
-                    if ($tag[2] == 'text') echo hsc($value);
                     if ($tag[2] == 'date') echo dformat($value);
+                    else echo hsc($value);
                     echo '</dd>';
                 }
             }
-- 
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

---
 lib/tpl/default/mediamanager.css | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index cceecf7fe..88e00d8fc 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,24 +1,3 @@
-/* --- Tree formatting --- */
-
-#media-menu img {
-    float: left;
-    padding: 0.5em 0.3em 0 0;
-}
-
-#media-menu ul {
-    list-style-type: none;
-    list-style-image: none;
-    margin-left: 1.5em;
-}
-
-#media-menu li {
-    clear: left;
-    list-style-type: none;
-    list-style-image: none;
-}
-
-/* -------------- */
-
 .mediamanager {
     width: 100%;
     overflow-y: auto;
@@ -212,7 +191,7 @@ form.meta textarea.edit {
 
 .mediamanager-list li .name,
 .mediamanager-list li .size,
-.mediamanager-list li .filesize
+.mediamanager-list li .filesize,
 .mediamanager-list li .date {
     overflow: hidden;
     float: left;
-- 
cgit v1.2.3


From de11c42f80968ac41dc4164829845c1e5dae25c2 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 9 Jul 2011 23:21:50 +0300
Subject: media-manager fixes

---
 lib/tpl/default/mediamanager.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 88e00d8fc..eea62ea46 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -232,6 +232,7 @@ form.meta textarea.edit {
     padding: 2px;
     vertical-align: top;
     zoom: 1;
+    color: black !important;
 }
 * html .mediamanager-table-50 li {
     display: inline;
@@ -239,4 +240,8 @@ form.meta textarea.edit {
 
 .mediamanager-preview {
     margin-bottom: 5px;
+}
+
+.idx .selected {
+    color: red !important;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 4928b6eb7137cb1e8727ca7a7fc99db614b0df88 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 10 Jul 2011 16:38:04 +0300
Subject: mediamanager resizable

---
 lib/tpl/default/mediamanager.css | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index eea62ea46..55ac39fd2 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,20 +1,19 @@
 .mediamanager {
     width: 100%;
-    overflow-y: auto;
+    overflow-x: auto;
 }
 
 .mediamanager .mediamanager-slider {
-    width: auto;
+
 }
 
 .mediamanager .mediamanager-slider .layout {
-    float: left;
     margin-left: 5px;
     margin-right: 5px;
+    float: left;
 }
 
 .mediamanager .scroll-container {
-    /*height: 0px;*/
     overflow-y: auto;
     overflow-x: hidden;
     padding: 0;
@@ -32,17 +31,17 @@
 .mediamanager-link-thumbnails {
     background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
     padding-left: 30px;
-    display: block;
-    float: left;
+    display: inline-block;
     width: 0;
     overflow: hidden;
+
+    margin-left: 10px;
 }
 
 .mediamanager-link-list {
     background: url('../../images/icon-list.png') 0 -4px no-repeat;
     padding-left: 30px;
-    display: block;
-    float: left;
+    display: inline-block;
     width: 0;
     overflow: hidden;
 }
@@ -242,6 +241,10 @@ form.meta textarea.edit {
     margin-bottom: 5px;
 }
 
+.ui-resizable-e:hover {
+    background-color: #dadada;
+}
+
 .idx .selected {
     color: red !important;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From dd9ba38e965cfc3c06fbb80fed65556dbfbfda1c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 14 Jul 2011 11:36:48 +0300
Subject: mediamanager tabs, upload form fix

---
 lib/tpl/default/mediamanager.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 55ac39fd2..e87473687 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -246,5 +246,10 @@ form.meta textarea.edit {
 }
 
 .idx .selected {
-    color: red !important;
+    background-color: __highlight__;
+    font-weight: bold;
+}
+
+.mediamanager div.upload {
+    padding-bottom: 0.5em;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 23786fd7ff0ff9c41ba627bc43ba6a45d3b779cc Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 14 Jul 2011 23:37:38 +0300
Subject: mediamanager icons

---
 lib/tpl/default/mediamanager.css | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e87473687..df2b961b6 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -134,7 +134,7 @@ form.meta textarea.edit {
 }
 *+html .mediamanager-thumbs li {
     display: inline;
-    _height: 130px;
+    height: 130px;
 }
 
 .mediamanager-thumbs li .image {
@@ -144,12 +144,20 @@ form.meta textarea.edit {
     overflow: hidden;
 }
 
+.mediamanager-thumbs li .image div {
+    vertical-align: middle;
+    display: table-cell;
+    width: 100px;
+    height: 90px;
+}
+
 .mediamanager-thumbs li .name,
 .mediamanager-thumbs li .size,
 .mediamanager-thumbs li .filesize,
 .mediamanager-thumbs li .date {
     display: block;
     overflow: hidden;
+    white-space: nowrap;
 }
 
 .mediamanager-thumbs li input[type=checkbox] {
@@ -186,6 +194,7 @@ form.meta textarea.edit {
 
 .mediamanager-list li .image img {
     width: 100%;
+    vertical-align: middle;
 }
 
 .mediamanager-list li .name,
@@ -196,11 +205,26 @@ form.meta textarea.edit {
     float: left;
     width: 19%;
     margin-left: 1%;
+    white-space: nowrap;
 }
 
 .mediamanager-list li .date,
 .mediamanager-thumbs li .date {
     font-style: italic;
+    white-space: normal;
+}
+
+.mediamanager-list .icon {
+    max-width: 16px;
+    max-height: 16px;
+}
+
+.mediamanager-list li .image div {
+    vertical-align: middle;
+    text-align: center;
+    display: table-cell;
+    width: 100px;
+    height: 40px;
 }
 
 .mediamanager-list li input[type=checkbox] {
@@ -231,8 +255,9 @@ form.meta textarea.edit {
     padding: 2px;
     vertical-align: top;
     zoom: 1;
-    color: black !important;
+    color: black;
 }
+
 * html .mediamanager-table-50 li {
     display: inline;
 }
@@ -252,4 +277,8 @@ form.meta textarea.edit {
 
 .mediamanager div.upload {
     padding-bottom: 0.5em;
-}
\ No newline at end of file
+}
+
+.background-container .icon {
+    margin-right: 5px;
+}
-- 
cgit v1.2.3


From e136d6cc09a2c32050ecc37d7b0deebd0979c15d Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 16 Jul 2011 23:48:48 +0300
Subject: mediamanager image diff

---
 lib/tpl/default/mediamanager.css | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index df2b961b6..6c4b64d3e 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -263,6 +263,7 @@ form.meta textarea.edit {
 }
 
 .mediamanager-preview {
+    text-align: center;
     margin-bottom: 5px;
 }
 
@@ -282,3 +283,35 @@ form.meta textarea.edit {
 .background-container .icon {
     margin-right: 5px;
 }
+
+.mediamanager dl.img_tags dd.highlighted{
+    background-color: __highlight__;
+}
+
+#mediamanager__diff_opacity_image1,
+#mediamanager__diff_portions_image1 {
+    width: 99%;
+    position: relative;
+}
+
+#mediamanager__diff_opacity_image2 {
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    opacity: 0.5;
+}
+
+#mediamanager__diff_portions_image2 {
+    width: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-right: 1px solid red;
+}
+
+#mediamanager__opacity_slider,
+#mediamanager__portions_slider {
+    margin: 10px;
+    width: 99%;
+}
-- 
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

---
 lib/tpl/default/mediamanager.css | 184 ++++++++++++++++++++++-----------------
 1 file changed, 105 insertions(+), 79 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 6c4b64d3e..02c732ce7 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,19 +1,17 @@
+/* Layout */
+
 .mediamanager {
     width: 100%;
     overflow-x: auto;
 }
 
-.mediamanager .mediamanager-slider {
-
-}
-
-.mediamanager .mediamanager-slider .layout {
+#mediamanager__layout .layout {
     margin-left: 5px;
     margin-right: 5px;
     float: left;
 }
 
-.mediamanager .scroll-container {
+#mediamanager__layout .scroll-container {
     overflow-y: auto;
     overflow-x: hidden;
     padding: 0;
@@ -21,44 +19,45 @@
     text-align: left;
 }
 
-.background-container {
+#mediamanager__layout .background-container {
     background-color: __background_alt__;
     margin-bottom: 10px;
     padding: 10px;
     text-align: left;
 }
 
-.mediamanager-link-thumbnails {
-    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
-    padding-left: 30px;
-    display: inline-block;
-    width: 0;
-    overflow: hidden;
+#mediamanager__layout .background-container .icon {
+    margin-right: 5px;
+}
 
-    margin-left: 10px;
+#mediamanager__layout_namespaces {
+    width: 25%;
+    min-width: 125px;
 }
 
-.mediamanager-link-list {
-    background: url('../../images/icon-list.png') 0 -4px no-repeat;
-    padding-left: 30px;
-    display: inline-block;
-    width: 0;
-    overflow: hidden;
+#mediamanager__layout_list {
+    width: 40%;
+    min-width: 375px;
 }
 
-.mediamanager-block-sort {
-    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
-    padding-left: 30px;
-    display: block;
-    float: right;
+#mediamanager__layout_detail {
+    width: 30%;
+    min-width: 200px;
 }
 
-.mediamanager-link-thumbnails:hover,
-.mediamanager-link-list:hover {
-    width: auto;
-    margin-right: 10px;
+.ui-resizable-e:hover {
+    background-color: #dadada;
 }
 
+/* Namespaces tree */
+
+.idx .selected {
+    background-color: __highlight__;
+    font-weight: bold;
+}
+
+/* Tabs */
+
 .mediamanager-tabs a {
     font-weight: bold;
     display: block;
@@ -66,13 +65,7 @@
     padding: 10px;
     padding-bottom: 5px;
     padding-top: 5px;
-
     margin-right: 2px;
-
-    -moz-border-radius-topright: 10px;
-    -webkit-border-top-right-radius: 10px;
-    -moz-border-radius-topleft: 10px;
-    -webkit-border-top-left-radius: 10px;
     border-top-right-radius: 10px;
     border-top-left-radius: 10px;
 }
@@ -86,34 +79,55 @@
     opacity: 0.5;
 }
 
-.mediamanager-table td {
-    padding: 5px;
+/* Title links */
+
+#mediamanager__tabs_list {
+    display: inline;
 }
 
-.mediamanager-table tr:nth-child(2n+1){
-    background-color: __background_neu__;
+#mediamanager__link_thumbs {
+    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: inline-block;
+    width: 0;
+    overflow: hidden;
+    margin-left: 10px;
 }
 
-.mediamanager-table {
-   background: expression(this.rowIndex % 2 == 0 ? "#ffffff" : "#f5f5f5");
+#mediamanager__link_list {
+    background: url('../../images/icon-list.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: inline-block;
+    width: 0;
+    overflow: hidden;
 }
 
-.mediamanager-table tr:hover {
-    background-color: __background_alt__;
+#mediamanager__link_thumbs:hover,
+#mediamanager__link_list:hover {
+    width: auto;
+    margin-right: 10px;
 }
 
-form.meta textarea.edit {
-    height: 8em;
-    width: 95%;
-    min-width: 95%;
-    max-width: 95%;
+#mediamanager__sort {
+    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: block;
+    float: right;
 }
 
-.mediamanager-file-list {
+/* File list */
+
+#mediamanager__file_list {
     padding: 0;
     margin: 0 !important;
 }
 
+#mediamanager__file_list li:hover {
+    background-color: #dadada;
+}
+
+/* Files thumbs view */
+
 .mediamanager-thumbs li {
     width: 100px;
     min-height: 130px;
@@ -129,9 +143,11 @@ form.meta textarea.edit {
     zoom: 1;
     position: relative;
 }
+
 * html .mediamanager-thumbs li {
     display: inline;
 }
+
 *+html .mediamanager-thumbs li {
     display: inline;
     height: 130px;
@@ -160,6 +176,11 @@ form.meta textarea.edit {
     white-space: nowrap;
 }
 
+.mediamanager-thumbs li .date {
+    font-style: italic;
+    white-space: normal;
+}
+
 .mediamanager-thumbs li input[type=checkbox] {
     display: none;
     float: left;
@@ -171,6 +192,8 @@ form.meta textarea.edit {
     display: block;
 }
 
+/* Files list view */
+
 .mediamanager-list li {
     list-style: none;
     display: block;
@@ -194,7 +217,6 @@ form.meta textarea.edit {
 
 .mediamanager-list li .image img {
     width: 100%;
-    vertical-align: middle;
 }
 
 .mediamanager-list li .name,
@@ -208,8 +230,7 @@ form.meta textarea.edit {
     white-space: nowrap;
 }
 
-.mediamanager-list li .date,
-.mediamanager-thumbs li .date {
+.mediamanager-list li .date {
     font-style: italic;
     white-space: normal;
 }
@@ -238,16 +259,41 @@ form.meta textarea.edit {
     display: block;
 }
 
-.mediamanager-file-list li:hover {
-    background-color: #dadada;
+/* Upload panel */
+
+#mediamanager__layout div.upload {
+    padding-bottom: 0.5em;
 }
 
-.mediamanager-table-50 {
+/* File preview */
+
+#mediamanager__preview,
+#mediamanager__preview_buttons {
+    text-align: center;
+    margin-bottom: 5px;
+}
+
+#mediamanager__preview img {
+    width: 99%;
+}
+
+/* Meta data edit form */
+
+form.meta textarea.edit {
+    height: 8em;
+    width: 95%;
+    min-width: 95%;
+    max-width: 95%;
+}
+
+/* File diff */
+
+#mediamanager__diff_table {
     padding: 0;
     margin: 0 !important;
 }
 
-.mediamanager-table-50 li {
+#mediamanager__diff_table li {
     width: 48%;
     display: inline-block;
     margin: 0;
@@ -258,33 +304,13 @@ form.meta textarea.edit {
     color: black;
 }
 
-* html .mediamanager-table-50 li {
+* html #mediamanager__diff_table li {
     display: inline;
 }
 
-.mediamanager-preview {
-    text-align: center;
-    margin-bottom: 5px;
-}
-
-.ui-resizable-e:hover {
-    background-color: #dadada;
-}
-
-.idx .selected {
-    background-color: __highlight__;
-    font-weight: bold;
-}
-
-.mediamanager div.upload {
-    padding-bottom: 0.5em;
-}
-
-.background-container .icon {
-    margin-right: 5px;
-}
+/* Image diff */
 
-.mediamanager dl.img_tags dd.highlighted{
+#mediamanager__layout dl.img_tags dd.highlighted{
     background-color: __highlight__;
 }
 
-- 
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

---
 lib/tpl/default/mediamanager.css | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 02c732ce7..dc12dcbec 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,11 +1,11 @@
 /* Layout */
 
-.mediamanager {
+#mediamanager__page {
     width: 100%;
-    overflow-x: auto;
 }
 
-#mediamanager__layout .layout {
+#mediamanager__layout .layout,
+#mediamanager__layout .layout-resizable {
     margin-left: 5px;
     margin-right: 5px;
     float: left;
@@ -31,18 +31,18 @@
 }
 
 #mediamanager__layout_namespaces {
-    width: 25%;
+    width: 15%;
     min-width: 125px;
 }
 
 #mediamanager__layout_list {
-    width: 40%;
+    width: 47%;
     min-width: 375px;
 }
 
 #mediamanager__layout_detail {
-    width: 30%;
-    min-width: 200px;
+    width: 33%;
+    min-width: 265px;
 }
 
 .ui-resizable-e:hover {
-- 
cgit v1.2.3


From 6316bc7147a7ef1e90e2040d46bd40d034a09f13 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 19 Jul 2011 18:32:21 +0300
Subject: mediamanager list view thumbnails

---
 lib/tpl/default/mediamanager.css | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index dc12dcbec..25cfe07e9 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -36,13 +36,13 @@
 }
 
 #mediamanager__layout_list {
-    width: 47%;
+    width: 45%;
     min-width: 375px;
 }
 
 #mediamanager__layout_detail {
-    width: 33%;
-    min-width: 265px;
+    width: 35%;
+    min-width: 300px;
 }
 
 .ui-resizable-e:hover {
@@ -66,6 +66,10 @@
     padding-bottom: 5px;
     padding-top: 5px;
     margin-right: 2px;
+    -moz-border-radius-topright: 10px;
+    -webkit-border-top-right-radius: 10px;
+    -moz-border-radius-topleft: 10px;
+    -webkit-border-top-left-radius: 10px;
     border-top-right-radius: 10px;
     border-top-left-radius: 10px;
 }
@@ -153,14 +157,20 @@
     height: 130px;
 }
 
-.mediamanager-thumbs li .image {
+.mediamanager-thumbs li .image,
+.mediamanager-thumbs li .image0 {
     width: 100%;
     height: 90px;
     display: block;
     overflow: hidden;
 }
 
-.mediamanager-thumbs li .image div {
+.mediamanager-thumbs li .image1 {
+    display: none;
+}
+
+.mediamanager-thumbs li .image div,
+.mediamanager-thumbs li .image0 div {
     vertical-align: middle;
     display: table-cell;
     width: 100px;
@@ -207,16 +217,18 @@
     background-color: __background_neu__;
 }
 
-.mediamanager-list li .image {
+.mediamanager-list li .image,
+.mediamanager-list li .image1 {
     width: 10%;
     display: block;
     overflow: hidden;
     float: left;
     height: 40px;
+    text-align: center;
 }
 
-.mediamanager-list li .image img {
-    width: 100%;
+.mediamanager-list li .image0 {
+    display: none;
 }
 
 .mediamanager-list li .name,
@@ -240,7 +252,8 @@
     max-height: 16px;
 }
 
-.mediamanager-list li .image div {
+.mediamanager-list li .image div,
+.mediamanager-list li .image1 div {
     vertical-align: middle;
     text-align: center;
     display: table-cell;
@@ -325,6 +338,8 @@ form.meta textarea.edit {
     position: absolute;
     top: 0;
     left: 0;
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
     opacity: 0.5;
 }
 
-- 
cgit v1.2.3


From 67c8cda19c0bf26a746d5c5cf9c82ee7ae5f23ca Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 19 Jul 2011 18:36:15 +0300
Subject: mediamanager revisions form

---
 lib/tpl/default/mediamanager.css | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 25cfe07e9..490d90c62 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -299,6 +299,24 @@ form.meta textarea.edit {
     max-width: 95%;
 }
 
+/* Revisions form */
+
+#mediamanager__details #page__revisions ul {
+    margin-left: 10px;
+    list-style-type: none;
+}
+
+#mediamanager__details #page__revisions ul li div.li div {
+    font-size: 12px;
+    color: gray;
+    padding-left: 18px;
+}
+
+#mediamanager__details #page__revisions ul li div.li input {
+    position: relative;
+    top: 1px;
+}
+
 /* File diff */
 
 #mediamanager__diff_table {
-- 
cgit v1.2.3


From b5941dfab8516bd445afebc91d6a4942cab4d5f0 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 25 Jul 2011 14:06:25 +0300
Subject: Recent Changes integration of media changes

---
 lib/tpl/default/design.css | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 1dee4dc69..a94f814aa 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -246,18 +246,12 @@ div.dokuwiki div.pagenav-next {
     width: 49%
 }
 
-/* ----------- type of recent changes ------------- */
+/* ----------- type of recent changes select -------- */
 
-div.dokuwiki div.changestypenav {
-    border-bottom: 1px solid __border__;
-    padding-bottom: 10px;
+div.dokuwiki form#dw__recent select {
     margin-bottom: 10px;
 }
 
-div.dokuwiki div.changestypenav label {
-    padding-right: 10px;
-}
-
 /* --------------- Links ------------------ */
 
 div.dokuwiki a:link,
-- 
cgit v1.2.3


From 4ee1558545059fa73700709a9ef4c0ab22ce8f92 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 26 Jul 2011 11:55:38 +0300
Subject: image diffs fixes

---
 lib/tpl/default/mediamanager.css | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 490d90c62..431b61d6e 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -321,7 +321,8 @@ form.meta textarea.edit {
 
 #mediamanager__diff_table {
     padding: 0;
-    margin: 0 !important;
+    margin: 0;
+    margin-top: 10px;
 }
 
 #mediamanager__diff_table li {
@@ -345,10 +346,15 @@ form.meta textarea.edit {
     background-color: __highlight__;
 }
 
+#mediamanager__form_diffview {
+    margin-bottom: 10px;
+}
+
 #mediamanager__diff_opacity_image1,
 #mediamanager__diff_portions_image1 {
     width: 99%;
     position: relative;
+    margin-top: 10px;
 }
 
 #mediamanager__diff_opacity_image2 {
@@ -372,5 +378,5 @@ form.meta textarea.edit {
 #mediamanager__opacity_slider,
 #mediamanager__portions_slider {
     margin: 10px;
-    width: 99%;
+    width: 95%;
 }
-- 
cgit v1.2.3


From c17d1d0ed0fcdb8f0d4663a47bad8df069760b49 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 1 Aug 2011 01:16:20 +0300
Subject: issue #32 mediamanager layout css fix

---
 lib/tpl/default/mediamanager.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 431b61d6e..353230cc6 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -2,6 +2,11 @@
 
 #mediamanager__page {
     width: 100%;
+    overflow-x: auto;
+}
+
+#mediamanager__layout {
+    min-width: 840px;
 }
 
 #mediamanager__layout .layout,
@@ -42,7 +47,7 @@
 
 #mediamanager__layout_detail {
     width: 35%;
-    min-width: 300px;
+    min-width: 290px;
 }
 
 .ui-resizable-e:hover {
-- 
cgit v1.2.3


From 69143ff27bdf2a979818367613e604f8ee4aef88 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 1 Aug 2011 01:21:21 +0300
Subject: issue #40 image resized in all diff views

---
 lib/tpl/default/mediamanager.css | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 353230cc6..a2fd35a47 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -355,18 +355,22 @@ form.meta textarea.edit {
     margin-bottom: 10px;
 }
 
-#mediamanager__diff_opacity_image1,
-#mediamanager__diff_portions_image1 {
-    width: 99%;
+#mediamanager__diff_layout {
     position: relative;
-    margin-top: 10px;
 }
 
-#mediamanager__diff_opacity_image2 {
-    width: 100%;
+#mediamanager__diff_layout div {
     position: absolute;
     top: 0;
     left: 0;
+    width: 100%;
+}
+
+#mediamanager__diff_layout div img {
+    width: 100%;
+}
+
+#mediamanager__diff_opacity_image2 {
     -moz-opacity: 0.5;
     -khtml-opacity: 0.5;
     opacity: 0.5;
@@ -374,10 +378,8 @@ form.meta textarea.edit {
 
 #mediamanager__diff_portions_image2 {
     width: 50%;
-    position: absolute;
-    top: 0;
-    left: 0;
     border-right: 1px solid red;
+    overflow: hidden;
 }
 
 #mediamanager__opacity_slider,
-- 
cgit v1.2.3


From d5daba103cb1ed14fd07618ef936ca8d5cffb50c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 1 Aug 2011 01:39:36 +0300
Subject: css class name fix

---
 lib/tpl/default/mediamanager.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index a2fd35a47..8d351cd95 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -313,7 +313,7 @@ form.meta textarea.edit {
 
 #mediamanager__details #page__revisions ul li div.li div {
     font-size: 12px;
-    color: gray;
+    color: __text_neu__;
     padding-left: 18px;
 }
 
@@ -338,7 +338,7 @@ form.meta textarea.edit {
     padding: 2px;
     vertical-align: top;
     zoom: 1;
-    color: black;
+    color: __text__;
 }
 
 * html #mediamanager__diff_table li {
-- 
cgit v1.2.3


From a1a02ef6d327f2de7ffc7db57a7907465761b407 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 3 Aug 2011 19:10:16 +0300
Subject: issue #43 diff slider

---
 lib/tpl/default/mediamanager.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 8d351cd95..49f2901e2 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -363,21 +363,23 @@ form.meta textarea.edit {
     position: absolute;
     top: 0;
     left: 0;
-    width: 100%;
 }
 
-#mediamanager__diff_layout div img {
+#mediamanager__diff_layout div img,
+#mediamanager__diff_opacity_image1,
+#mediamanager__diff_portions_image1 {
     width: 100%;
 }
 
 #mediamanager__diff_opacity_image2 {
+    width: 100%;
     -moz-opacity: 0.5;
     -khtml-opacity: 0.5;
     opacity: 0.5;
 }
 
 #mediamanager__diff_portions_image2 {
-    width: 50%;
+    width: 100%;
     border-right: 1px solid red;
     overflow: hidden;
 }
-- 
cgit v1.2.3


From 09063cc66339d6e5daa12af4896a2457c03cfaf3 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 4 Aug 2011 20:32:16 +0300
Subject: issue #44 multi file uploader

---
 lib/tpl/default/fileuploader.css | 31 +++++++++++++++++++++++++++++++
 lib/tpl/default/style.ini        |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 lib/tpl/default/fileuploader.css

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/fileuploader.css b/lib/tpl/default/fileuploader.css
new file mode 100644
index 000000000..0e3f111a9
--- /dev/null
+++ b/lib/tpl/default/fileuploader.css
@@ -0,0 +1,31 @@
+.qq-uploader { position:relative; width: 100%;}
+
+.qq-upload-button {
+    display:block; /* or inline-block */
+    width: 105px; padding: 7px 0; text-align:center;    
+    background:#880000; border-bottom:1px solid #ddd;color:#fff;
+}
+.qq-upload-button-hover {background:#cc0000;}
+.qq-upload-button-focus {outline:1px dotted black;}
+
+.qq-upload-drop-area {
+    position:absolute; top:0; left:0; width:100%; height:100%; min-height: 70px; z-index:2;
+    background:#FF9797; text-align:center; 
+}
+.qq-upload-drop-area span {
+    display:block; position:absolute; top: 50%; width:100%; margin-top:-8px; font-size:16px;
+}
+.qq-upload-drop-area-active {background:#FF7171;}
+
+.qq-upload-list {margin:15px 35px; padding:0; list-style:disc;}
+.qq-upload-list li { margin:0; padding:0; line-height:15px; font-size:12px;}
+.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
+    margin-right: 7px;
+}
+
+.qq-upload-file {}
+.qq-upload-spinner {display:inline-block; background: url("loading.gif"); width:15px; height:15px; vertical-align:text-bottom;}
+.qq-upload-size,.qq-upload-cancel {font-size:11px;}
+
+.qq-upload-failed-text {display:none;}
+.qq-upload-fail .qq-upload-failed-text {display:inline;}
\ No newline at end of file
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index bc28d1bbc..e12ddbf57 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -16,6 +16,7 @@ _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
 mediamanager.css  = screen
+fileuploader.css  = screen
 
 rtl.css        = rtl
 print.css      = print
-- 
cgit v1.2.3


From b4b31bac3276c93277a8b70368aee135b7fdde09 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 6 Aug 2011 16:21:06 +0300
Subject: issue #43 images align

---
 lib/tpl/default/mediamanager.css | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 49f2901e2..8a42a9e35 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -324,6 +324,10 @@ form.meta textarea.edit {
 
 /* File diff */
 
+#mediamanager__diff {
+    margin-top: 10px;
+}
+
 #mediamanager__diff_table {
     padding: 0;
     margin: 0;
@@ -365,21 +369,24 @@ form.meta textarea.edit {
     left: 0;
 }
 
-#mediamanager__diff_layout div img,
 #mediamanager__diff_opacity_image1,
 #mediamanager__diff_portions_image1 {
+    width: 97%;
+}
+
+#mediamanager__diff_layout div img {
     width: 100%;
 }
 
 #mediamanager__diff_opacity_image2 {
-    width: 100%;
+    width: 97%;
     -moz-opacity: 0.5;
     -khtml-opacity: 0.5;
     opacity: 0.5;
 }
 
 #mediamanager__diff_portions_image2 {
-    width: 100%;
+    width: 97%;
     border-right: 1px solid red;
     overflow: hidden;
 }
-- 
cgit v1.2.3


From 8d7448594cb00e995bed9b6e6db6e7f9280da24d Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 7 Aug 2011 13:54:36 +0300
Subject: issue #44 fileuploader specific changes made in inheriting class

---
 lib/tpl/default/fileuploader.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/fileuploader.css b/lib/tpl/default/fileuploader.css
index 0e3f111a9..56fcb01ed 100644
--- a/lib/tpl/default/fileuploader.css
+++ b/lib/tpl/default/fileuploader.css
@@ -2,7 +2,7 @@
 
 .qq-upload-button {
     display:block; /* or inline-block */
-    width: 105px; padding: 7px 0; text-align:center;    
+    width: 105px; padding: 7px 0; text-align:center;
     background:#880000; border-bottom:1px solid #ddd;color:#fff;
 }
 .qq-upload-button-hover {background:#cc0000;}
@@ -10,7 +10,7 @@
 
 .qq-upload-drop-area {
     position:absolute; top:0; left:0; width:100%; height:100%; min-height: 70px; z-index:2;
-    background:#FF9797; text-align:center; 
+    background:#FF9797; text-align:center;
 }
 .qq-upload-drop-area span {
     display:block; position:absolute; top: 50%; width:100%; margin-top:-8px; font-size:16px;
@@ -24,7 +24,7 @@
 }
 
 .qq-upload-file {}
-.qq-upload-spinner {display:inline-block; background: url("loading.gif"); width:15px; height:15px; vertical-align:text-bottom;}
+.qq-upload-spinner {display:inline-block; background: url("../../images/throbber.gif"); width:15px; height:15px; vertical-align:text-bottom;}
 .qq-upload-size,.qq-upload-cancel {font-size:11px;}
 
 .qq-upload-failed-text {display:none;}
-- 
cgit v1.2.3


From f517998ad64483b6394211a971db2d3a660518c6 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 7 Aug 2011 22:14:10 +0300
Subject: issue #45 browser testing

---
 lib/tpl/default/mediamanager.css | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 8a42a9e35..bd9efdca1 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -124,6 +124,12 @@
     float: right;
 }
 
+* html #mediamanager__sort,
+*+html #mediamanager__sort {
+    position: relative;
+    margin-top: -18px;
+}
+
 /* File list */
 
 #mediamanager__file_list {
@@ -159,7 +165,6 @@
 
 *+html .mediamanager-thumbs li {
     display: inline;
-    height: 130px;
 }
 
 .mediamanager-thumbs li .image,
@@ -174,8 +179,8 @@
     display: none;
 }
 
-.mediamanager-thumbs li .image div,
-.mediamanager-thumbs li .image0 div {
+.mediamanager-thumbs li .image span,
+.mediamanager-thumbs li .image0 span {
     vertical-align: middle;
     display: table-cell;
     width: 100px;
@@ -188,6 +193,7 @@
 .mediamanager-thumbs li .date {
     display: block;
     overflow: hidden;
+    width: 90px;
     white-space: nowrap;
 }
 
@@ -257,8 +263,8 @@
     max-height: 16px;
 }
 
-.mediamanager-list li .image div,
-.mediamanager-list li .image1 div {
+.mediamanager-list li .image span,
+.mediamanager-list li .image1 span {
     vertical-align: middle;
     text-align: center;
     display: table-cell;
@@ -348,6 +354,9 @@ form.meta textarea.edit {
 * html #mediamanager__diff_table li {
     display: inline;
 }
+*+html #mediamanager__diff_table li {
+    display: inline;
+}
 
 /* Image diff */
 
-- 
cgit v1.2.3


From 0eca67c2d107d04c48f193b1ff5c84653d064693 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 8 Aug 2011 19:57:26 +0300
Subject: issue #44 uploader css fix

---
 lib/tpl/default/fileuploader.css | 96 +++++++++++++++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 16 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/fileuploader.css b/lib/tpl/default/fileuploader.css
index 56fcb01ed..9f5e30dab 100644
--- a/lib/tpl/default/fileuploader.css
+++ b/lib/tpl/default/fileuploader.css
@@ -1,31 +1,95 @@
-.qq-uploader { position:relative; width: 100%;}
+.qq-uploader {
+    position:relative;
+    width: 100%;
+}
 
 .qq-upload-button {
     display:block; /* or inline-block */
-    width: 105px; padding: 7px 0; text-align:center;
-    background:#880000; border-bottom:1px solid #ddd;color:#fff;
+    width: 105px;
+    padding: 7px 0;
+    text-align:center;
+    background:#880000;
+    border-bottom:1px solid #ddd;
+    color:#fff;
+}
+
+.qq-upload-button-hover {
+    background:#cc0000;
+}
+
+.qq-upload-button-focus {
+    outline:1px dotted black;
 }
-.qq-upload-button-hover {background:#cc0000;}
-.qq-upload-button-focus {outline:1px dotted black;}
 
 .qq-upload-drop-area {
-    position:absolute; top:0; left:0; width:100%; height:100%; min-height: 70px; z-index:2;
-    background:#FF9797; text-align:center;
+    position:absolute;
+    top:0;
+    left:0;
+    width:100%;
+    height:100%;
+    min-height: 70px;
+    z-index:2;
+    background:#FF9797;
+    text-align:center;
 }
+
 .qq-upload-drop-area span {
-    display:block; position:absolute; top: 50%; width:100%; margin-top:-8px; font-size:16px;
+    display:block;
+    position:absolute;
+    top: 50%;
+    width:100%;
+    margin-top:-8px;
+    font-size:16px;
+}
+
+.qq-upload-drop-area-active {
+    background:#FF7171;
+}
+
+.qq-upload-list {
+    margin: 15px 35px !important;
+    padding: 0;
+    list-style: disc;
+    margin-top: 10px !important;
+}
+
+.qq-upload-list li {
+    margin: 0;
+    padding: 0;
+    line-height: 15px;
+    font-size: 12px;
+    margin-bottom: 5px;
 }
-.qq-upload-drop-area-active {background:#FF7171;}
 
-.qq-upload-list {margin:15px 35px; padding:0; list-style:disc;}
-.qq-upload-list li { margin:0; padding:0; line-height:15px; font-size:12px;}
 .qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
     margin-right: 7px;
 }
 
-.qq-upload-file {}
-.qq-upload-spinner {display:inline-block; background: url("../../images/throbber.gif"); width:15px; height:15px; vertical-align:text-bottom;}
-.qq-upload-size,.qq-upload-cancel {font-size:11px;}
+.qq-upload-spinner {
+    display: inline-block;
+    background: url("../../images/throbber.gif");
+    width: 15px;
+    height: 15px;
+    vertical-align: text-bottom;
+}
+
+.qq-upload-size,.qq-upload-cancel {
+    font-size:11px;
+}
+
+.qq-upload-failed-text {
+    display:none;
+}
+
+.qq-upload-fail .qq-upload-failed-text {
+    display:inline;
+}
+
+.qq-upload-list li .qq-upload-file {
+    display: block;
+    font-weight: bold;
+}
 
-.qq-upload-failed-text {display:none;}
-.qq-upload-fail .qq-upload-failed-text {display:inline;}
\ No newline at end of file
+.qq-upload-list li .qq-upload-cancel {
+    padding-left: 10px;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 44d638d049d687159666813023108e0fa9f32181 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 12 Aug 2011 14:18:03 +0300
Subject: issue #50 partly styling the new uploader

---
 lib/tpl/default/fileuploader.css | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/fileuploader.css b/lib/tpl/default/fileuploader.css
index 9f5e30dab..bf187d3c0 100644
--- a/lib/tpl/default/fileuploader.css
+++ b/lib/tpl/default/fileuploader.css
@@ -47,10 +47,12 @@
 }
 
 .qq-upload-list {
-    margin: 15px 35px !important;
+    margin: 0 !important;
     padding: 0;
-    list-style: disc;
+    list-style: none !important;
     margin-top: 10px !important;
+    margin-bottom: 10px !important;
+    color: black !important;
 }
 
 .qq-upload-list li {
@@ -90,6 +92,10 @@
     font-weight: bold;
 }
 
+.qq-upload-file-hidden {
+    display:none !important;
+}
+
 .qq-upload-list li .qq-upload-cancel {
     padding-left: 10px;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From e9eba4b18be81444014e59c83ee6c5cf004a7ad7 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 12 Aug 2011 17:04:27 +0300
Subject: issue #51 link from detail view to fullscreen manager

---
 lib/tpl/default/detail.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index f7bb37a25..84b659176 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -49,6 +49,13 @@ if (!defined('DOKU_INC')) die();
       </p>
 
       <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
+      <p><?php
+            $imgNS = getNS($IMG);
+            $authNS = auth_quickaclcheck("$imgNS:*");
+            if ($authNS >= AUTH_UPLOAD) {
+                echo '<a href="'.media_managerURL(array('ns' => $imgNS, 'image' => $IMG)).'">'.$lang['img_manager'].'</a>';
+            }
+      ?></p>
 
       <dl class="img_tags">
         <?php
-- 
cgit v1.2.3


From 873cd06e1bda38e0decce16d6ec7d3bdaece612e Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 14:22:19 +0300
Subject: issue #50 styling the new uploader

---
 lib/tpl/default/_fileuploader.css | 91 +++++++++++++++++++++++++++++++++++++++
 lib/tpl/default/style.ini         |  2 +-
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 lib/tpl/default/_fileuploader.css

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
new file mode 100644
index 000000000..07f3158a1
--- /dev/null
+++ b/lib/tpl/default/_fileuploader.css
@@ -0,0 +1,91 @@
+.qq-uploader {
+    position: relative;
+    width: 100%;
+}
+
+.qq-upload-button {
+    display: block;
+    width: 115px;
+    padding: 7px 0;
+    text-align: center;
+    background: __background_alt__;
+    border: 1px solid __border__;
+    color: __extern__;
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+
+.qq-upload-button-hover {
+    background: __border__;
+    color: __background__;
+}
+
+.qq-upload-button-focus {
+    outline: 1px dotted black;
+}
+
+.qq-upload-drop-area {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    min-height: 70px;
+    z-index: 2;
+    background: __background_neu__;
+    text-align: center;
+}
+
+.qq-upload-drop-area span {
+    display:block;
+    position:absolute;
+    top: 50%;
+    width:100%;
+    margin-top:-8px;
+    font-size:16px;
+}
+
+.qq-upload-drop-area-active {
+    background: #DADADA;
+}
+
+.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
+    margin-right: 7px;
+}
+
+.qq-upload-spinner {
+    display: inline-block;
+    background: url("../../images/throbber.gif");
+    width: 15px;
+    height: 15px;
+    vertical-align: text-bottom;
+}
+
+.qq-upload-size,.qq-upload-cancel {
+    font-size:11px;
+}
+
+.qq-upload-failed-text {
+    display:none;
+}
+
+.qq-upload-fail .qq-upload-failed-text {
+    display:inline;
+}
+
+.qq-upload-file {
+    display: block;
+    font-weight: bold;
+}
+
+.qq-upload-file-hidden {
+    display:none;
+}
+
+.qq-upload-cancel {
+    padding-left: 10px;
+}
+
+.qq-uploader #dw__ow {
+    margin: 10px 0;
+}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index e12ddbf57..05914012e 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -16,7 +16,7 @@ _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
 mediamanager.css  = screen
-fileuploader.css  = screen
+_fileuploader.css = screen
 
 rtl.css        = rtl
 print.css      = print
-- 
cgit v1.2.3


From 5b9353fa4e818ffe50c9fbc1094b01fe30b96758 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 16:29:14 +0300
Subject: mediamanager html bug fixes

---
 lib/tpl/default/mediamanager.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index bd9efdca1..f6ad721e0 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -291,13 +291,13 @@
 
 /* File preview */
 
-#mediamanager__preview,
-#mediamanager__preview_buttons {
+.mediamanager__preview,
+.mediamanager__preview_buttons {
     text-align: center;
     margin-bottom: 5px;
 }
 
-#mediamanager__preview img {
+.mediamanager__preview img {
     width: 99%;
 }
 
-- 
cgit v1.2.3


From 32140a507cf5c3ab86367689ea9aa25063463e5a Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 18:16:43 +0300
Subject: old fileuploader.css deleted

---
 lib/tpl/default/fileuploader.css | 101 ---------------------------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 lib/tpl/default/fileuploader.css

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/fileuploader.css b/lib/tpl/default/fileuploader.css
deleted file mode 100644
index bf187d3c0..000000000
--- a/lib/tpl/default/fileuploader.css
+++ /dev/null
@@ -1,101 +0,0 @@
-.qq-uploader {
-    position:relative;
-    width: 100%;
-}
-
-.qq-upload-button {
-    display:block; /* or inline-block */
-    width: 105px;
-    padding: 7px 0;
-    text-align:center;
-    background:#880000;
-    border-bottom:1px solid #ddd;
-    color:#fff;
-}
-
-.qq-upload-button-hover {
-    background:#cc0000;
-}
-
-.qq-upload-button-focus {
-    outline:1px dotted black;
-}
-
-.qq-upload-drop-area {
-    position:absolute;
-    top:0;
-    left:0;
-    width:100%;
-    height:100%;
-    min-height: 70px;
-    z-index:2;
-    background:#FF9797;
-    text-align:center;
-}
-
-.qq-upload-drop-area span {
-    display:block;
-    position:absolute;
-    top: 50%;
-    width:100%;
-    margin-top:-8px;
-    font-size:16px;
-}
-
-.qq-upload-drop-area-active {
-    background:#FF7171;
-}
-
-.qq-upload-list {
-    margin: 0 !important;
-    padding: 0;
-    list-style: none !important;
-    margin-top: 10px !important;
-    margin-bottom: 10px !important;
-    color: black !important;
-}
-
-.qq-upload-list li {
-    margin: 0;
-    padding: 0;
-    line-height: 15px;
-    font-size: 12px;
-    margin-bottom: 5px;
-}
-
-.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
-    margin-right: 7px;
-}
-
-.qq-upload-spinner {
-    display: inline-block;
-    background: url("../../images/throbber.gif");
-    width: 15px;
-    height: 15px;
-    vertical-align: text-bottom;
-}
-
-.qq-upload-size,.qq-upload-cancel {
-    font-size:11px;
-}
-
-.qq-upload-failed-text {
-    display:none;
-}
-
-.qq-upload-fail .qq-upload-failed-text {
-    display:inline;
-}
-
-.qq-upload-list li .qq-upload-file {
-    display: block;
-    font-weight: bold;
-}
-
-.qq-upload-file-hidden {
-    display:none !important;
-}
-
-.qq-upload-list li .qq-upload-cancel {
-    padding-left: 10px;
-}
\ No newline at end of file
-- 
cgit v1.2.3


From d1bde35aad17baac31ecd72079da42112288bbb5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 18 Aug 2011 15:00:49 +0300
Subject: issue #51 detail.php p tag fixed

---
 lib/tpl/default/detail.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index 84b659176..503c0ef71 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -49,13 +49,13 @@ if (!defined('DOKU_INC')) die();
       </p>
 
       <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
-      <p><?php
+      <?php
             $imgNS = getNS($IMG);
             $authNS = auth_quickaclcheck("$imgNS:*");
             if ($authNS >= AUTH_UPLOAD) {
-                echo '<a href="'.media_managerURL(array('ns' => $imgNS, 'image' => $IMG)).'">'.$lang['img_manager'].'</a>';
+                echo '<p><a href="'.media_managerURL(array('ns' => $imgNS, 'image' => $IMG)).'">'.$lang['img_manager'].'</a></p>';
             }
-      ?></p>
+      ?>
 
       <dl class="img_tags">
         <?php
-- 
cgit v1.2.3


From da45d8839c94444f8e89f45ef290516542976ee8 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 18 Aug 2011 15:03:33 +0300
Subject: issue #50 styling uploader

---
 lib/tpl/default/_fileuploader.css | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 07f3158a1..e87ba94db 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -87,5 +87,14 @@
 }
 
 .qq-uploader #dw__ow {
-    margin: 10px 0;
+    margin: 10px 3px -5px 10px;
 }
+
+.qq-uploader .check {
+    line-height: 18px;
+}
+
+.qq-uploader #mediamanager__upload_button {
+    margin-top: -5px;
+    margin-bottom: 10px;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From c472bad9de398442c30ec1410d07284f0db8b821 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 20:56:43 +0300
Subject: issue #44 new uploader in the media popup

---
 lib/tpl/default/_fileuploader.css | 32 +++++++++++++++++---------------
 lib/tpl/default/media.css         |  5 +++++
 lib/tpl/default/mediamanager.css  |  7 ++++++-
 3 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index e87ba94db..0e53f8187 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -4,20 +4,18 @@
 }
 
 .qq-upload-button {
-    display: block;
-    width: 115px;
-    padding: 7px 0;
-    text-align: center;
-    background: __background_alt__;
+    display: inline-block;
     border: 1px solid __border__;
-    color: __extern__;
-    font-weight: bold;
+    color: __text__;
+    background-color: __background__;
+    vertical-align: middle;
+    text-decoration: none;
+    font-size: 100%;
+    cursor: pointer;
+    margin: 1px;
     margin-bottom: 5px;
-}
-
-.qq-upload-button-hover {
-    background: __border__;
-    color: __background__;
+    padding: 0.125em 0.4em;
+    background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
 }
 
 .qq-upload-button-focus {
@@ -42,11 +40,11 @@
     top: 50%;
     width:100%;
     margin-top:-8px;
-    font-size:16px;
+    font-size: 120%;
 }
 
 .qq-upload-drop-area-active {
-    background: #DADADA;
+    background: __background_alt__;
 }
 
 .qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
@@ -62,7 +60,7 @@
 }
 
 .qq-upload-size,.qq-upload-cancel {
-    font-size:11px;
+    font-size: 85%;
 }
 
 .qq-upload-failed-text {
@@ -97,4 +95,8 @@
 .qq-uploader #mediamanager__upload_button {
     margin-top: -5px;
     margin-bottom: 10px;
+}
+
+.qq-uploader div.li {
+    margin-bottom: 5px;
 }
\ No newline at end of file
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 7b558a80b..b325a1ef6 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -151,6 +151,11 @@ it's dirty, so any "real" fixes are welcome */
     border-bottom: solid 1px __border__;
     padding: 0 0.5em 1em 0.5em;
 }
+
+#media__content form#dw__upload {
+    border-bottom: 0;
+}
+
 #media__content form#dw__upload fieldset {
     padding: 0;
     margin: 0;
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index f6ad721e0..ad371ee3d 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -289,6 +289,11 @@
     padding-bottom: 0.5em;
 }
 
+#media__content #mediamanager__uploader {
+    border-bottom: 1px solid #8CACBB;
+    padding-bottom: 0.5em;
+}
+
 /* File preview */
 
 .mediamanager__preview,
@@ -318,7 +323,7 @@ form.meta textarea.edit {
 }
 
 #mediamanager__details #page__revisions ul li div.li div {
-    font-size: 12px;
+    font-size: 90%;
     color: __text_neu__;
     padding-left: 18px;
 }
-- 
cgit v1.2.3


From 9de3b5710719658ef75740c0bd930423cc7c209c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 21 Aug 2011 02:16:39 +0300
Subject: issue #44 uploader fixes, #45 browser testing

---
 lib/tpl/default/_fileuploader.css | 12 ++++++++----
 lib/tpl/default/mediamanager.css  |  7 +++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 0e53f8187..9e60393a0 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -8,7 +8,6 @@
     border: 1px solid __border__;
     color: __text__;
     background-color: __background__;
-    vertical-align: middle;
     text-decoration: none;
     font-size: 100%;
     cursor: pointer;
@@ -18,6 +17,11 @@
     background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
 }
 
+* html .qq-upload-button,
+*+html .qq-upload-button {
+    display: inline;
+}
+
 .qq-upload-button-focus {
     outline: 1px dotted black;
 }
@@ -84,8 +88,9 @@
     padding-left: 10px;
 }
 
-.qq-uploader #dw__ow {
-    margin: 10px 3px -5px 10px;
+.qq-uploader .dw__ow {
+    margin-left: 10px;
+    margin-right: 3px;
 }
 
 .qq-uploader .check {
@@ -93,7 +98,6 @@
 }
 
 .qq-uploader #mediamanager__upload_button {
-    margin-top: -5px;
     margin-bottom: 10px;
 }
 
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index ad371ee3d..245bb5550 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -22,6 +22,7 @@
     padding: 0;
     margin: 0;
     text-align: left;
+    position: relative;
 }
 
 #mediamanager__layout .background-container {
@@ -359,10 +360,16 @@ form.meta textarea.edit {
 * html #mediamanager__diff_table li {
     display: inline;
 }
+
 *+html #mediamanager__diff_table li {
     display: inline;
 }
 
+/* For IE7 */
+*:first-child+html #mediamanager__diff_table li {
+    width: 45%;
+}
+
 /* Image diff */
 
 #mediamanager__layout dl.img_tags dd.highlighted{
-- 
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

---
 lib/tpl/default/mediamanager.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 245bb5550..16982d98d 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -291,7 +291,7 @@
 }
 
 #media__content #mediamanager__uploader {
-    border-bottom: 1px solid #8CACBB;
+    border-bottom: 1px solid __border__;
     padding-bottom: 0.5em;
 }
 
-- 
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

---
 lib/tpl/default/mediamanager.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 16982d98d..c71882fba 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -5,6 +5,10 @@
     overflow-x: auto;
 }
 
+#mediamanager__page h1 {
+    margin: 0 0 .5em;
+}
+
 #mediamanager__layout {
     min-width: 840px;
 }
-- 
cgit v1.2.3


From 1264397e06c4d2d61c390022dea56f63c333d05c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Sep 2011 17:41:33 +0100
Subject: media manager design: improved some spacing

---
 lib/tpl/default/mediamanager.css | 44 +++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 14 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index c71882fba..731509050 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -15,8 +15,11 @@
 
 #mediamanager__layout .layout,
 #mediamanager__layout .layout-resizable {
-    margin-left: 5px;
-    margin-right: 5px;
+    float: left;
+}
+
+#mediamanager__layout .layout-resizable {
+    margin-right: 10px;
     float: left;
 }
 
@@ -32,8 +35,9 @@
 #mediamanager__layout .background-container {
     background-color: __background_alt__;
     margin-bottom: 10px;
-    padding: 10px;
+    padding: 10px 10px 8px;
     text-align: left;
+    min-height: 20px;
 }
 
 #mediamanager__layout .background-container .icon {
@@ -61,6 +65,14 @@
 
 /* Namespaces tree */
 
+#mediamanager__page ul.idx {
+    margin-left: .2em;
+}
+
+#mediamanager__page ul.idx ul {
+    margin-left: 1em;
+}
+
 .idx .selected {
     background-color: __highlight__;
     font-weight: bold;
@@ -95,25 +107,30 @@
 
 /* Title links */
 
+#mediamanager__files .namespace {
+    float: left;
+    font-weight: normal;
+}
+
 #mediamanager__tabs_list {
-    display: inline;
+    float: left;
 }
 
-#mediamanager__link_thumbs {
-    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
+#mediamanager__link_thumbs,
+#mediamanager__link_list {
     padding-left: 30px;
     display: inline-block;
     width: 0;
     overflow: hidden;
+}
+
+#mediamanager__link_thumbs {
+    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
     margin-left: 10px;
 }
 
 #mediamanager__link_list {
     background: url('../../images/icon-list.png') 0 -4px no-repeat;
-    padding-left: 30px;
-    display: inline-block;
-    width: 0;
-    overflow: hidden;
 }
 
 #mediamanager__link_thumbs:hover,
@@ -152,13 +169,12 @@
     width: 100px;
     min-height: 130px;
     display: inline-block;
-    margin: 0;
-    margin-right: 10px;
-    margin-bottom: 10px;
+    display: -moz-inline-stack;
+    /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
+    margin: 0 6px 10px 0;
     background-color: __background_alt__;
     padding: 10px;
     vertical-align: top;
-    display: -moz-inline-stack;
     text-align: center;
     zoom: 1;
     position: relative;
-- 
cgit v1.2.3


From da1b91c1503e06e3e999bd96d64a76b81ca70518 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Sep 2011 18:25:01 +0100
Subject: media manager design: more spacing and some colour changes

---
 lib/tpl/default/mediamanager.css | 50 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 6 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 731509050..33c2753fc 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -160,7 +160,7 @@
 }
 
 #mediamanager__file_list li:hover {
-    background-color: #dadada;
+    background-color: __background_alt__;
 }
 
 /* Files thumbs view */
@@ -172,12 +172,14 @@
     display: -moz-inline-stack;
     /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
     margin: 0 6px 10px 0;
-    background-color: __background_alt__;
-    padding: 10px;
+    background-color: __background_neu__;
+    color: __text__;
+    padding: 5px;
     vertical-align: top;
     text-align: center;
     zoom: 1;
     position: relative;
+    line-height: 1.2;
 }
 
 * html .mediamanager-thumbs li {
@@ -218,6 +220,11 @@
     white-space: nowrap;
 }
 
+.mediamanager-thumbs li .name {
+    padding: 5px 0;
+    font-weight: bold;
+}
+
 .mediamanager-thumbs li .date {
     font-style: italic;
     white-space: normal;
@@ -243,6 +250,8 @@
     max-height: 50px;
     margin: 0;
     margin-bottom: 3px;
+    background-color: __background__;
+    color: __text__;
 }
 
 .mediamanager-list li:nth-child(2n+1) {
@@ -269,11 +278,24 @@
 .mediamanager-list li .date {
     overflow: hidden;
     float: left;
-    width: 19%;
     margin-left: 1%;
     white-space: nowrap;
 }
 
+.mediamanager-list li .name {
+    width: 30%;
+    font-weight: bold;
+}
+
+.mediamanager-list li .size,
+.mediamanager-list li .filesize {
+    width: 15%;
+}
+
+.mediamanager-list li .date {
+    width: 20%;
+}
+
 .mediamanager-list li .date {
     font-style: italic;
     white-space: normal;
@@ -329,8 +351,24 @@
 
 /* Meta data edit form */
 
-form.meta textarea.edit {
-    height: 8em;
+#mediamanager__details div.metafield {
+    margin-bottom: 5px;
+}
+
+#mediamanager__details label {
+    display: block;
+}
+
+#mediamanager__details form.meta input {
+    width: 50%;
+}
+
+#mediamanager__details form.meta input.button {
+    width: auto;
+}
+
+#mediamanager__details form.meta textarea.edit {
+    height: 6em;
     width: 95%;
     min-width: 95%;
     max-width: 95%;
-- 
cgit v1.2.3


From 28b19f13203b5263ad89854a9c1df221975e4c38 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Sep 2011 19:33:52 +0100
Subject: media manager design: added icon to resizing handle and changed
 background colour

---
 lib/tpl/default/images/resizecol.png | Bin 0 -> 443 bytes
 lib/tpl/default/mediamanager.css     |  14 ++++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 lib/tpl/default/images/resizecol.png

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/images/resizecol.png b/lib/tpl/default/images/resizecol.png
new file mode 100644
index 000000000..79fea0770
Binary files /dev/null and b/lib/tpl/default/images/resizecol.png differ
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 33c2753fc..ea69dbeb9 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -59,8 +59,18 @@
     min-width: 290px;
 }
 
-.ui-resizable-e:hover {
-    background-color: #dadada;
+#mediamanager__page .ui-resizable-e {
+    width: 16px;
+    right: -13px;
+    /* icon from Crystal Clear icon set (LGPL) */
+    background: transparent url(images/resizecol.png) 0 25px no-repeat;
+}
+
+#mediamanager__page .ui-resizable-e:hover {
+    width: 6px;
+    right: -8px;
+    background-image: none;
+    background-color: __background_alt__;
 }
 
 /* Namespaces tree */
-- 
cgit v1.2.3