Merge branch 'master' of github.com:lupo49/dokuwiki

8 files changed, 631 insertions, 24 deletions

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
new file mode 100644
index 000000000..9e60393a0
--- /dev/null
+++ b/lib/tpl/default/_fileuploader.css
@@ -0,0 +1,106 @@
+.qq-uploader {
+    position: relative;
+    width: 100%;
+}
+
+.qq-upload-button {
+    display: inline-block;
+    border: 1px solid __border__;
+    color: __text__;
+    background-color: __background__;
+    text-decoration: none;
+    font-size: 100%;
+    cursor: pointer;
+    margin: 1px;
+    margin-bottom: 5px;
+    padding: 0.125em 0.4em;
+    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;
+}
+
+.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: 120%;
+}
+
+.qq-upload-drop-area-active {
+    background: __background_alt__;
+}
+
+.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: 85%;
+}
+
+.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-left: 10px;
+    margin-right: 3px;
+}
+
+.qq-uploader .check {
+    line-height: 18px;
+}
+
+.qq-uploader #mediamanager__upload_button {
+    margin-bottom: 10px;
+}
+
+.qq-uploader div.li {
+    margin-bottom: 5px;
+}
\ No newline at end of file
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 1fdf2bfac..a94f814aa 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -246,6 +246,12 @@ div.dokuwiki div.pagenav-next {
     width: 49%
 }
 
+/* ----------- type of recent changes select -------- */
+
+div.dokuwiki form#dw__recent select {
+    margin-bottom: 10px;
+}
+
 /* --------------- Links ------------------ */
 
 div.dokuwiki a:link,
diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index 4f42b116e..503c0ef71 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -49,33 +49,33 @@ if (!defined('DOKU_INC')) die();
       </p>
 
       <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
+      <?php
+            $imgNS = getNS($IMG);
+            $authNS = auth_quickaclcheck("$imgNS:*");
+            if ($authNS >= AUTH_UPLOAD) {
+                echo '<p><a href="'.media_managerURL(array('ns' => $imgNS, 'image' => $IMG)).'">'.$lang['img_manager'].'</a></p>';
+            }
+      ?>
 
       <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>';
-
+            $config_files = getConfigFiles('mediameta');
+            foreach ($config_files as $config_file) {
+                if(@file_exists($config_file)) include($config_file);
+            }
+
+            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] == 'date') echo dformat($value);
+                    else echo hsc($value);
+                    echo '</dd>';
+                }
+            }
         ?>
       </dl>
       <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
diff --git a/lib/tpl/default/images/resizecol.png b/lib/tpl/default/images/resizecol.png
new file mode 100644
index 000000000..79fea0770
--- /dev/null
+++ b/lib/tpl/default/images/resizecol.png
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 26e84fde6..3e85c58f2 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -116,6 +116,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')?>
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
new file mode 100644
index 000000000..ea69dbeb9
--- /dev/null
+++ b/lib/tpl/default/mediamanager.css
@@ -0,0 +1,487 @@
+/* Layout */
+
+#mediamanager__page {
+    width: 100%;
+    overflow-x: auto;
+}
+
+#mediamanager__page h1 {
+    margin: 0 0 .5em;
+}
+
+#mediamanager__layout {
+    min-width: 840px;
+}
+
+#mediamanager__layout .layout,
+#mediamanager__layout .layout-resizable {
+    float: left;
+}
+
+#mediamanager__layout .layout-resizable {
+    margin-right: 10px;
+    float: left;
+}
+
+#mediamanager__layout .scroll-container {
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 0;
+    margin: 0;
+    text-align: left;
+    position: relative;
+}
+
+#mediamanager__layout .background-container {
+    background-color: __background_alt__;
+    margin-bottom: 10px;
+    padding: 10px 10px 8px;
+    text-align: left;
+    min-height: 20px;
+}
+
+#mediamanager__layout .background-container .icon {
+    margin-right: 5px;
+}
+
+#mediamanager__layout_namespaces {
+    width: 15%;
+    min-width: 125px;
+}
+
+#mediamanager__layout_list {
+    width: 45%;
+    min-width: 375px;
+}
+
+#mediamanager__layout_detail {
+    width: 35%;
+    min-width: 290px;
+}
+
+#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 */
+
+#mediamanager__page ul.idx {
+    margin-left: .2em;
+}
+
+#mediamanager__page ul.idx ul {
+    margin-left: 1em;
+}
+
+.idx .selected {
+    background-color: __highlight__;
+    font-weight: bold;
+}
+
+/* Tabs */
+
+.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: __background_alt__;
+}
+
+.mediamanager-tabs a:hover {
+    background-color: __background_alt__;
+    opacity: 0.5;
+}
+
+/* Title links */
+
+#mediamanager__files .namespace {
+    float: left;
+    font-weight: normal;
+}
+
+#mediamanager__tabs_list {
+    float: left;
+}
+
+#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;
+}
+
+#mediamanager__link_thumbs:hover,
+#mediamanager__link_list:hover {
+    width: auto;
+    margin-right: 10px;
+}
+
+#mediamanager__sort {
+    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
+    padding-left: 30px;
+    display: block;
+    float: right;
+}
+
+* html #mediamanager__sort,
+*+html #mediamanager__sort {
+    position: relative;
+    margin-top: -18px;
+}
+
+/* File list */
+
+#mediamanager__file_list {
+    padding: 0;
+    margin: 0 !important;
+}
+
+#mediamanager__file_list li:hover {
+    background-color: __background_alt__;
+}
+
+/* Files thumbs view */
+
+.mediamanager-thumbs li {
+    width: 100px;
+    min-height: 130px;
+    display: inline-block;
+    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_neu__;
+    color: __text__;
+    padding: 5px;
+    vertical-align: top;
+    text-align: center;
+    zoom: 1;
+    position: relative;
+    line-height: 1.2;
+}
+
+* html .mediamanager-thumbs li {
+    display: inline;
+}
+
+*+html .mediamanager-thumbs li {
+    display: inline;
+}
+
+.mediamanager-thumbs li .image,
+.mediamanager-thumbs li .image0 {
+    width: 100%;
+    height: 90px;
+    display: block;
+    overflow: hidden;
+}
+
+.mediamanager-thumbs li .image1 {
+    display: none;
+}
+
+.mediamanager-thumbs li .image span,
+.mediamanager-thumbs li .image0 span {
+    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;
+    width: 90px;
+    white-space: nowrap;
+}
+
+.mediamanager-thumbs li .name {
+    padding: 5px 0;
+    font-weight: bold;
+}
+
+.mediamanager-thumbs li .date {
+    font-style: italic;
+    white-space: normal;
+}
+
+.mediamanager-thumbs li input[type=checkbox] {
+    display: none;
+    float: left;
+    margin: 3px;
+}
+
+.mediamanager-thumbs li:hover input[type=checkbox],
+.mediamanager-thumbs li input[type=checkbox]:checked {
+    display: block;
+}
+
+/* Files list view */
+
+.mediamanager-list li {
+    list-style: none;
+    display: block;
+    position: relative;
+    max-height: 50px;
+    margin: 0;
+    margin-bottom: 3px;
+    background-color: __background__;
+    color: __text__;
+}
+
+.mediamanager-list li:nth-child(2n+1) {
+    background-color: __background_neu__;
+}
+
+.mediamanager-list li .image,
+.mediamanager-list li .image1 {
+    width: 10%;
+    display: block;
+    overflow: hidden;
+    float: left;
+    height: 40px;
+    text-align: center;
+}
+
+.mediamanager-list li .image0 {
+    display: none;
+}
+
+.mediamanager-list li .name,
+.mediamanager-list li .size,
+.mediamanager-list li .filesize,
+.mediamanager-list li .date {
+    overflow: hidden;
+    float: left;
+    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;
+}
+
+.mediamanager-list .icon {
+    max-width: 16px;
+    max-height: 16px;
+}
+
+.mediamanager-list li .image span,
+.mediamanager-list li .image1 span {
+    vertical-align: middle;
+    text-align: center;
+    display: table-cell;
+    width: 100px;
+    height: 40px;
+}
+
+.mediamanager-list li input[type=checkbox] {
+    display: none;
+    float: left;
+    margin: 3px;
+}
+
+.mediamanager-list li:hover input[type=checkbox],
+.mediamanager-list li input[type=checkbox]:checked {
+    display: block;
+}
+
+/* Upload panel */
+
+#mediamanager__layout div.upload {
+    padding-bottom: 0.5em;
+}
+
+#media__content #mediamanager__uploader {
+    border-bottom: 1px solid __border__;
+    padding-bottom: 0.5em;
+}
+
+/* File preview */
+
+.mediamanager__preview,
+.mediamanager__preview_buttons {
+    text-align: center;
+    margin-bottom: 5px;
+}
+
+.mediamanager__preview img {
+    width: 99%;
+}
+
+/* Meta data edit form */
+
+#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%;
+}
+
+/* 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: 90%;
+    color: __text_neu__;
+    padding-left: 18px;
+}
+
+#mediamanager__details #page__revisions ul li div.li input {
+    position: relative;
+    top: 1px;
+}
+
+/* File diff */
+
+#mediamanager__diff {
+    margin-top: 10px;
+}
+
+#mediamanager__diff_table {
+    padding: 0;
+    margin: 0;
+    margin-top: 10px;
+}
+
+#mediamanager__diff_table li {
+    width: 48%;
+    display: inline-block;
+    margin: 0;
+    margin-bottom: 10px;
+    padding: 2px;
+    vertical-align: top;
+    zoom: 1;
+    color: __text__;
+}
+
+* 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{
+    background-color: __highlight__;
+}
+
+#mediamanager__form_diffview {
+    margin-bottom: 10px;
+}
+
+#mediamanager__diff_layout {
+    position: relative;
+}
+
+#mediamanager__diff_layout div {
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+#mediamanager__diff_opacity_image1,
+#mediamanager__diff_portions_image1 {
+    width: 97%;
+}
+
+#mediamanager__diff_layout div img {
+    width: 100%;
+}
+
+#mediamanager__diff_opacity_image2 {
+    width: 97%;
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5;
+}
+
+#mediamanager__diff_portions_image2 {
+    width: 97%;
+    border-right: 1px solid red;
+    overflow: hidden;
+}
+
+#mediamanager__opacity_slider,
+#mediamanager__portions_slider {
+    margin: 10px;
+    width: 95%;
+}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index c5b2c31a5..05914012e 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -15,6 +15,8 @@ _mediaoptions.css = screen
 _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
+mediamanager.css  = screen
+_fileuploader.css = screen
 
 rtl.css        = rtl
 print.css      = print