--- /dev/null
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/_fileuploader.css dokuwiki-rc2011-11-10/lib/tpl/default/_fileuploader.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/_fileuploader.css 1970-01-01 02:00:00.000000000 +0200
++++ dokuwiki-rc2011-11-10/lib/tpl/default/_fileuploader.css 2011-11-11 13:25:17.000000000 +0200
+@@ -0,0 +1,111 @@
++
++.qq-uploader {
++ position: relative;
++ width: 100%;
++}
++
++.qq-uploader .error {
++ color: #f00;
++ background-color: #fff;
++}
++
++/* select file button */
++
++.qq-upload-button {
++ display: inline-block;
++ border: 1px solid __border__;
++ color: __text__;
++ background: __background__ url(images/buttonshadow.png) repeat-x bottom;
++ text-decoration: none;
++ font-size: 100%;
++ cursor: pointer;
++ margin: 1px 1px 5px;
++ padding: 0.125em 0.4em;
++}
++
++* html .qq-upload-button,
++*+html .qq-upload-button {
++ display: inline;
++}
++
++.qq-upload-button-focus {
++ outline: 1px dotted;
++}
++
++/* drop area */
++
++.qq-upload-drop-area {
++ position: absolute;
++ top: 0;
++ left: 0;
++ width: 100%;
++ height: 100%;
++ min-height: 70px;
++ z-index: 2;
++ background: __background_neu__;
++ color: __text__;
++ 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__;
++}
++
++/* list of files to upload */
++
++div.qq-uploader ul {
++ margin: 0;
++ list-style: none;
++}
++
++.qq-uploader li {
++ margin-bottom: 5px;
++ color: __text__;
++}
++
++.qq-uploader li span,
++.qq-uploader li input,
++.qq-uploader li a {
++ margin-right: 5px;
++}
++
++.qq-upload-file {
++ display: block;
++ font-weight: bold;
++}
++
++.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-action-container * {
++ vertical-align: middle;
++}
++.qq-overwrite-check input {
++ margin-left: 10px;
++}
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/_linkwiz.css dokuwiki-rc2011-11-10/lib/tpl/default/_linkwiz.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/_linkwiz.css 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/_linkwiz.css 2011-11-11 13:25:17.000000000 +0200
+@@ -16,6 +16,7 @@
+ background-color: __background_alt__;
+ height: 16px;
+ margin-bottom: 5px;
++ cursor: move;
+ }
+
+ #link__wiz_close {
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/_mediamanager.css dokuwiki-rc2011-11-10/lib/tpl/default/_mediamanager.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/_mediamanager.css 1970-01-01 02:00:00.000000000 +0200
++++ dokuwiki-rc2011-11-10/lib/tpl/default/_mediamanager.css 2011-11-11 13:25:17.000000000 +0200
+@@ -0,0 +1,429 @@
++
++/*____________ Layout ____________*/
++
++#mediamanager__page h1 {
++ margin: 0 0 .5em;
++}
++
++#mediamanager__page {
++ min-width: 800px;
++ width: 100%;
++ text-align: left;
++}
++
++#mediamanager__page .panel {
++ float: left;
++}
++
++#mediamanager__page .namespaces {
++ width: 15%;
++ min-width: 120px;
++}
++#mediamanager__page .filelist {
++ width: 50%;
++ min-width: 400px;
++}
++#mediamanager__page .file {
++ width: 35%;
++ min-width: 280px;
++}
++
++#mediamanager__page .panelHeader {
++ background-color: __background_alt__;
++ margin: 0 10px 10px 0;
++ padding: 10px 10px 8px;
++ text-align: left;
++ min-height: 20px;
++ overflow: hidden;
++}
++
++#mediamanager__page .panelContent {
++ overflow-y: auto;
++ overflow-x: hidden;
++ padding: 0;
++ margin: 0 10px 10px 0;
++ position: relative;
++}
++
++#mediamanager__page .file .panelHeader,
++#mediamanager__page .file .panelContent {
++ margin-right: 0;
++}
++
++#mediamanager__page .ui-resizable-e {
++ width: 6px;
++ right: 2px;
++ background: transparent url(images/resizecol.png) center center no-repeat;
++}
++#mediamanager__page .ui-resizable-e:hover {
++ background-color: __background_alt__;
++}
++
++/*____________ Namespaces tree ____________*/
++
++#mediamanager__page .namespaces h2 {
++ font-size: 1em;
++ display: inline-block;
++ border-width: 0;
++ padding: .3em .8em;
++ margin: 0 .3em 0 0;
++ border-radius: .5em .5em 0 0;
++ font-weight: normal;
++ background-color: __background_alt__;
++ color: __text__;
++ line-height: 1.5em;
++}
++* html #mediamanager__page .namespaces h2,
++*+html #mediamanager__page .namespaces h2 {
++ display: inline;
++}
++
++#mediamanager__page .namespaces ul {
++ margin-left: .2em;
++ list-style: none;
++}
++#mediamanager__page .namespaces ul ul {
++ margin-left: 1em;
++}
++
++#mediamanager__page .namespaces ul .selected {
++ background-color: __highlight__;
++ font-weight: bold;
++}
++
++/*____________ Panel header ____________*/
++
++#mediamanager__page .panelHeader h3 {
++ float: left;
++ font-weight: normal;
++ font-size: 1em;
++ padding: 0;
++ margin: 0 0 3px;
++}
++
++#mediamanager__page .panelHeader form.options {
++ float: right;
++ margin-top: -3px;
++}
++
++#mediamanager__page .panelHeader ul {
++ list-style: none;
++ margin: 0;
++ padding: 0;
++}
++#mediamanager__page .panelHeader ul li {
++ color: __text__;
++ float: left;
++ line-height: 1;
++ padding-left: 3px;
++}
++
++#mediamanager__page .panelHeader ul li.listType {
++ padding-left: 30px;
++ background: url('../../images/icon-list.png') 3px 1px no-repeat;
++}
++#mediamanager__page .panelHeader ul li.sortBy {
++ padding-left: 30px;
++ background: url('../../images/icon-sort.png') 3px 1px no-repeat;
++}
++
++#mediamanager__page .panelHeader form.options .ui-buttonset label{
++ font-size: 90%;
++ margin-right: -0.4em;
++}
++#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
++ padding: .4em .7em;
++ line-height: 1;
++}
++
++/*____________ File list ____________*/
++
++#mediamanager__page .filelist ul {
++ padding: 0;
++ margin: 0;
++}
++
++#mediamanager__page .filelist .panelContent ul li:hover {
++ background-color: __background_alt__;
++}
++
++#mediamanager__page .filelist li dt a {
++ vertical-align: middle;
++ display: table-cell;
++ overflow: hidden;
++}
++* html #mediamanager__page .filelist .thumbs li dt a,
++*+html #mediamanager__page .filelist .thumbs li dt a {
++ display: block;
++}
++* html #mediamanager__page .filelist .rows li dt a,
++*+html #mediamanager__page .filelist .rows li dt a {
++ display: inline;
++}
++
++/* thumbs */
++
++#mediamanager__page .filelist .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;
++ position: relative;
++ line-height: 1.2;
++}
++* html #mediamanager__page .filelist .thumbs li,
++*+html #mediamanager__page .filelist .thumbs li {
++ display: inline;
++ zoom: 1;
++}
++
++#mediamanager__page .filelist .thumbs li dt a {
++ width: 100px;
++ height: 90px;
++}
++
++#mediamanager__page .filelist .thumbs li dt a img {
++ max-width: 90px;
++ max-height: 90px;
++}
++
++#mediamanager__page .filelist .thumbs li .name,
++#mediamanager__page .filelist .thumbs li .size,
++#mediamanager__page .filelist .thumbs li .filesize,
++#mediamanager__page .filelist .thumbs li .date {
++ display: block;
++ overflow: hidden;
++ width: 90px;
++ white-space: nowrap;
++}
++#mediamanager__page .filelist .thumbs li .name {
++ padding: 5px 0;
++ font-weight: bold;
++}
++#mediamanager__page .filelist .thumbs li .date {
++ font-style: italic;
++ white-space: normal;
++}
++
++/* rows */
++
++#mediamanager__page .filelist .rows li {
++ list-style: none;
++ display: block;
++ position: relative;
++ max-height: 50px;
++ margin: 0;
++ margin-bottom: 3px;
++ background-color: __background__;
++ color: __text__;
++ overflow: hidden;
++}
++
++#mediamanager__page .filelist .rows li:nth-child(2n+1) {
++ background-color: __background_neu__;
++}
++
++#mediamanager__page .filelist .rows li dt {
++ float: left;
++ width: 10%;
++ height: 40px;
++ text-align: center;
++}
++
++#mediamanager__page .filelist .rows li dt a {
++ width: 100px;
++ height: 40px;
++}
++
++#mediamanager__page .filelist .rows li dt a img {
++ max-width: 40px;
++ max-height: 40px;
++}
++
++#mediamanager__page .filelist .rows li .name,
++#mediamanager__page .filelist .rows li .size,
++#mediamanager__page .filelist .rows li .filesize,
++#mediamanager__page .filelist .rows li .date {
++ overflow: hidden;
++ float: left;
++ margin-left: 1%;
++ white-space: nowrap;
++}
++
++#mediamanager__page .filelist .rows li .name {
++ width: 30%;
++ font-weight: bold;
++}
++#mediamanager__page .filelist .rows li .size,
++#mediamanager__page .filelist .rows li .filesize {
++ width: 15%;
++}
++#mediamanager__page .filelist .rows li .date {
++ width: 20%;
++ font-style: italic;
++ white-space: normal;
++}
++
++/*____________ Upload panel ____________*/
++
++#mediamanager__page div.upload {
++ padding-bottom: 0.5em;
++}
++
++#media__content #mediamanager__uploader {
++ border-bottom: 1px solid __border__;
++ padding-bottom: 0.5em;
++}
++
++/*____________ File preview ____________*/
++
++#mediamanager__page .file ul.actions {
++ text-align: center;
++ margin: 0 0 5px;
++ list-style: none;
++}
++#mediamanager__page .file ul.actions li {
++ display: inline;
++}
++
++#mediamanager__page .file div.image {
++ margin-bottom: 5px;
++ text-align: center;
++}
++
++#mediamanager__page .file div.image img {
++ width: 100%;
++}
++
++#mediamanager__page .file dl {
++}
++#mediamanager__page .file dl dt {
++ font-weight: bold;
++ display: block;
++ background-color: __background_alt__;
++}
++#mediamanager__page .file dl dd {
++ display: block;
++ background-color: __background_neu__;
++}
++
++
++/*____________ Meta data edit form ____________*/
++
++#mediamanager__page form.meta div.row {
++ margin-bottom: 5px;
++}
++
++#mediamanager__page form.meta label span {
++ display: block;
++}
++
++#mediamanager__page form.meta input {
++ width: 50%;
++}
++
++#mediamanager__page form.meta input.button {
++ width: auto;
++}
++
++#mediamanager__page form.meta textarea.edit {
++ height: 6em;
++ width: 95%;
++ min-width: 95%;
++ max-width: 95%;
++}
++
++/*____________ Revisions form ____________*/
++
++#mediamanager__page #page__revisions ul {
++ margin-left: 10px;
++ list-style-type: none;
++}
++
++#mediamanager__page #page__revisions ul li div.li div {
++ font-size: 90%;
++ color: __text_neu__;
++ padding-left: 18px;
++}
++
++#mediamanager__page #page__revisions ul li div.li input {
++ position: relative;
++ top: 1px;
++}
++
++/* File diff */
++
++#mediamanager__diff table {
++ table-layout: fixed;
++}
++
++#mediamanager__diff td,
++#mediamanager__diff th {
++ width: 48%;
++ margin: 0 5px 10px 0;
++ padding: 0;
++ vertical-align: top;
++ text-align: left;
++}
++
++#mediamanager__diff th {
++ font-weight: normal;
++}
++#mediamanager__diff th a {
++ font-weight: bold;
++}
++#mediamanager__diff th span {
++ font-size: 90%;
++}
++
++#mediamanager__diff dl dd strong{
++ background-color: __highlight__;
++ color: __text__;
++ font-weight: normal;
++}
++
++/* Image diff */
++
++#mediamanager__page .file form.diffView {
++ margin-bottom: 10px;
++ display: block;
++}
++
++#mediamanager__diff div.slider {
++ margin: 10px;
++ width: 95%;
++}
++
++#mediamanager__diff .imageDiff {
++ position: relative;
++}
++#mediamanager__diff .imageDiff .image1,
++#mediamanager__diff .imageDiff .image2 {
++ position: absolute;
++ top: 0;
++ left: 0;
++ width: 97%;
++}
++
++#mediamanager__diff .imageDiff.opacity .image2 {
++ -moz-opacity: 0.5;
++ -khtml-opacity: 0.5;
++ opacity: 0.5;
++}
++
++#mediamanager__diff .imageDiff.portions .image2 {
++ border-right: 1px solid red;
++ overflow: hidden;
++}
++
++#mediamanager__diff .imageDiff img {
++ width: 100%;
++}
++
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/_mediaoptions.css dokuwiki-rc2011-11-10/lib/tpl/default/_mediaoptions.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/_mediaoptions.css 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/_mediaoptions.css 2011-11-11 13:25:17.000000000 +0200
+@@ -1,92 +1,18 @@
+-/* --- popup --- */
+
+-#media__popup {
+- background-color:__background__;
+- display:none;
+- border: 1px solid __border__;
+- position: absolute;
+- width:280px;
++#media__popup_content p {
++ margin: 0 0 .5em;
+ }
+
+-#media__popup h1 {
+- text-align:center;
+- font-weight:normal;
+- background-color: __background_alt__;
+- height: 16px;
+- margin-bottom: 5px;
+- font-size:12px;
+- border-bottom: 0;
++#media__popup_content label {
++ float: left;
++ width: 9em;
+ }
+
+-#media__popup p {
+- display:block;
+- line-height:14pt;
+- margin:0.5em;
++#media__popup_content .button {
++ margin-right: 1px;
++ cursor: pointer;
+ }
+
+-#media_nolink {
+- padding:4px 0;
+-}
+-
+-#media__popup label {
+- float:left;
+- width:9em;
+-}
+-
+-#media__popup .button {
+- margin-left:auto;
+- margin-right:auto;
+-}
+-
+-#media__popup .btnlbl {
+- text-align:center;
+-}
+-
+-#media__popup .btnlbl input {
+- margin:0 1em;
+-}
+-
+-#media__closeimg {
+- float:right;
+-}
+-
+-/* --- display options --- */
+-
+-#media__linkopts label,
+-#media__nolnk {
+- width: 80px;
+- float: left;
+- margin-left: 10px;
+-}
+-
+-#media__linkopts label{
+- line-height: 20px;
+-}
+-
+-#media__nolnk,
+-#media__linkopts label.long{
+- margin-bottom: 8px;
+- line-height: 12px;
+-}
+-
+-#media__linkopts label.long{
+- width: 150px;
+- float: none;
+-}
+-
+-#media__linkopts br {
+- clear: both;
+-}
+-
+-#media__linkopts select {
+- width: 60px;
+- margin-left: 10px;
+-}
+-
+-#media__linkopts input.edit {
+- width:50px;
+- margin-left:10px;
+-}
+-#media__linkopts #media__title {
+- width:150px;
++#media__popup_content input.button {
++ margin-left: 9em;
+ }
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/_tabs.css dokuwiki-rc2011-11-10/lib/tpl/default/_tabs.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/_tabs.css 1970-01-01 02:00:00.000000000 +0200
++++ dokuwiki-rc2011-11-10/lib/tpl/default/_tabs.css 2011-11-11 13:25:17.000000000 +0200
+@@ -0,0 +1,37 @@
++
++.dokuwiki ul.tabs {
++ padding: 0;
++ margin: 0;
++ overflow: hidden;
++}
++.dokuwiki ul.tabs li {
++ float: left;
++ padding: 0;
++ margin: 0;
++ list-style: none;
++}
++
++.dokuwiki ul.tabs li strong,
++.dokuwiki ul.tabs li a {
++ float: left;
++ padding: .3em .8em;
++ margin: 0 .3em 0 0;
++ background-color: __background_neu__;
++ color: __text__;
++ border-radius: .5em .5em 0 0;
++}
++.dokuwiki ul.tabs li strong {
++ font-weight: normal;
++}
++
++.dokuwiki ul.tabs li a:link,
++.dokuwiki ul.tabs li a:visited {
++}
++.dokuwiki ul.tabs li a:hover,
++.dokuwiki ul.tabs li a:active,
++.dokuwiki ul.tabs li a:focus,
++.dokuwiki ul.tabs li strong {
++ background-color: __background_alt__;
++ color: __text__;
++ text-decoration: none;
++}
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/design.css dokuwiki-rc2011-11-10/lib/tpl/default/design.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/design.css 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/design.css 2011-11-11 13:25:17.000000000 +0200
+@@ -246,6 +246,12 @@
+ width: 49%
+ }
+
++/* ----------- type of recent changes select -------- */
++
++div.dokuwiki form#dw__recent select {
++ margin-bottom: 10px;
++}
++
+ /* --------------- Links ------------------ */
+
+ div.dokuwiki a:link,
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/detail.php dokuwiki-rc2011-11-10/lib/tpl/default/detail.php
+--- dokuwiki-2011-05-25a/lib/tpl/default/detail.php 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/detail.php 2011-11-11 13:25:17.000000000 +0200
+@@ -49,33 +49,33 @@
+ </p>
+
+ <p>← <?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'));?>
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/UWEB.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/UWEB.png differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/apple-touch-icon.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/apple-touch-icon.png differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/button-cc.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/button-cc.gif differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/button-rss.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/button-rss.png differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/link_icon.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/link_icon.gif differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/mail_icon.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/mail_icon.gif differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/resizecol.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/resizecol.png differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/tocdot2.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/tocdot2.gif differ
+Files dokuwiki-2011-05-25a/lib/tpl/default/images/windows.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/windows.gif differ
+diff -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/main.php dokuwiki-rc2011-11-10/lib/tpl/default/main.php
+--- dokuwiki-2011-05-25a/lib/tpl/default/main.php 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/main.php 2011-11-11 13:25:17.000000000 +0200
+@@ -28,8 +28,7 @@
+ </title>
+
+ <?php tpl_metaheaders()?>
+-
+- <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" />
++ <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
+
+ <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
+ </head>
+@@ -117,6 +116,7 @@
+ </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 -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/media.css dokuwiki-rc2011-11-10/lib/tpl/default/media.css
+--- dokuwiki-2011-05-25a/lib/tpl/default/media.css 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/media.css 2011-11-11 13:25:17.000000000 +0200
+@@ -32,6 +32,10 @@
+ margin-bottom: 0.5em;
+ }
+
++#media__manager a.select {
++ cursor: pointer;
++}
++
+ /* --- Tree formatting --- */
+
+ #media__tree img {
+@@ -141,12 +145,16 @@
+ padding: 0 0.5em 0.5em 0.5em;
+ }
+
+-#media__content form#dw__upload,
+-#media__content div#dw__flashupload {
++#media__content #mediamanager__uploader {
+ display: block;
+ 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 -ur -x .svn -x .git -x .bzr -x CVS -N dokuwiki-2011-05-25a/lib/tpl/default/style.ini dokuwiki-rc2011-11-10/lib/tpl/default/style.ini
+--- dokuwiki-2011-05-25a/lib/tpl/default/style.ini 2011-06-14 22:58:54.000000000 +0300
++++ dokuwiki-rc2011-11-10/lib/tpl/default/style.ini 2011-11-11 13:25:17.000000000 +0200
+@@ -15,6 +15,9 @@
+ _admin.css = screen
+ _linkwiz.css = screen
+ _subscription.css = screen
++_mediamanager.css = screen
++_tabs.css = screen
++_fileuploader.css = screen
+
+ rtl.css = rtl
+ print.css = print
projects / packages / dokuwiki-tpl-sidebar.git / commitdiff