1 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
2 --- dokuwiki-2011-05-25a/lib/tpl/default/_fileuploader.css 1970-01-01 02:00:00.000000000 +0200
3 +++ dokuwiki-rc2011-11-10/lib/tpl/default/_fileuploader.css 2011-11-11 13:25:17.000000000 +0200
11 +.qq-uploader .error {
13 + background-color: #fff;
16 +/* select file button */
19 + display: inline-block;
20 + border: 1px solid __border__;
22 + background: __background__ url(images/buttonshadow.png) repeat-x bottom;
23 + text-decoration: none;
26 + margin: 1px 1px 5px;
27 + padding: 0.125em 0.4em;
30 +* html .qq-upload-button,
31 +*+html .qq-upload-button {
35 +.qq-upload-button-focus {
36 + outline: 1px dotted;
41 +.qq-upload-drop-area {
49 + background: __background_neu__;
54 +.qq-upload-drop-area span {
63 +.qq-upload-drop-area-active {
64 + background: __background_alt__;
67 +/* list of files to upload */
79 +.qq-uploader li span,
80 +.qq-uploader li input,
91 + display: inline-block;
92 + background: url("../../images/throbber.gif");
95 + vertical-align: text-bottom;
103 +.qq-upload-failed-text {
106 +.qq-upload-fail .qq-upload-failed-text {
110 +.qq-action-container * {
111 + vertical-align: middle;
113 +.qq-overwrite-check input {
116 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
117 --- dokuwiki-2011-05-25a/lib/tpl/default/_linkwiz.css 2011-06-14 22:58:54.000000000 +0300
118 +++ dokuwiki-rc2011-11-10/lib/tpl/default/_linkwiz.css 2011-11-11 13:25:17.000000000 +0200
120 background-color: __background_alt__;
127 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
128 --- dokuwiki-2011-05-25a/lib/tpl/default/_mediamanager.css 1970-01-01 02:00:00.000000000 +0200
129 +++ dokuwiki-rc2011-11-10/lib/tpl/default/_mediamanager.css 2011-11-11 13:25:17.000000000 +0200
132 +/*____________ Layout ____________*/
134 +#mediamanager__page h1 {
138 +#mediamanager__page {
144 +#mediamanager__page .panel {
148 +#mediamanager__page .namespaces {
152 +#mediamanager__page .filelist {
156 +#mediamanager__page .file {
161 +#mediamanager__page .panelHeader {
162 + background-color: __background_alt__;
163 + margin: 0 10px 10px 0;
164 + padding: 10px 10px 8px;
170 +#mediamanager__page .panelContent {
172 + overflow-x: hidden;
174 + margin: 0 10px 10px 0;
175 + position: relative;
178 +#mediamanager__page .file .panelHeader,
179 +#mediamanager__page .file .panelContent {
183 +#mediamanager__page .ui-resizable-e {
186 + background: transparent url(images/resizecol.png) center center no-repeat;
188 +#mediamanager__page .ui-resizable-e:hover {
189 + background-color: __background_alt__;
192 +/*____________ Namespaces tree ____________*/
194 +#mediamanager__page .namespaces h2 {
196 + display: inline-block;
198 + padding: .3em .8em;
199 + margin: 0 .3em 0 0;
200 + border-radius: .5em .5em 0 0;
201 + font-weight: normal;
202 + background-color: __background_alt__;
204 + line-height: 1.5em;
206 +* html #mediamanager__page .namespaces h2,
207 +*+html #mediamanager__page .namespaces h2 {
211 +#mediamanager__page .namespaces ul {
215 +#mediamanager__page .namespaces ul ul {
219 +#mediamanager__page .namespaces ul .selected {
220 + background-color: __highlight__;
224 +/*____________ Panel header ____________*/
226 +#mediamanager__page .panelHeader h3 {
228 + font-weight: normal;
234 +#mediamanager__page .panelHeader form.options {
239 +#mediamanager__page .panelHeader ul {
244 +#mediamanager__page .panelHeader ul li {
251 +#mediamanager__page .panelHeader ul li.listType {
252 + padding-left: 30px;
253 + background: url('../../images/icon-list.png') 3px 1px no-repeat;
255 +#mediamanager__page .panelHeader ul li.sortBy {
256 + padding-left: 30px;
257 + background: url('../../images/icon-sort.png') 3px 1px no-repeat;
260 +#mediamanager__page .panelHeader form.options .ui-buttonset label{
262 + margin-right: -0.4em;
264 +#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
265 + padding: .4em .7em;
269 +/*____________ File list ____________*/
271 +#mediamanager__page .filelist ul {
276 +#mediamanager__page .filelist .panelContent ul li:hover {
277 + background-color: __background_alt__;
280 +#mediamanager__page .filelist li dt a {
281 + vertical-align: middle;
282 + display: table-cell;
285 +* html #mediamanager__page .filelist .thumbs li dt a,
286 +*+html #mediamanager__page .filelist .thumbs li dt a {
289 +* html #mediamanager__page .filelist .rows li dt a,
290 +*+html #mediamanager__page .filelist .rows li dt a {
296 +#mediamanager__page .filelist .thumbs li {
299 + display: inline-block;
300 + display: -moz-inline-stack;
301 + /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
302 + margin: 0 6px 10px 0;
303 + background-color: __background_neu__;
306 + vertical-align: top;
307 + text-align: center;
308 + position: relative;
311 +* html #mediamanager__page .filelist .thumbs li,
312 +*+html #mediamanager__page .filelist .thumbs li {
317 +#mediamanager__page .filelist .thumbs li dt a {
322 +#mediamanager__page .filelist .thumbs li dt a img {
327 +#mediamanager__page .filelist .thumbs li .name,
328 +#mediamanager__page .filelist .thumbs li .size,
329 +#mediamanager__page .filelist .thumbs li .filesize,
330 +#mediamanager__page .filelist .thumbs li .date {
334 + white-space: nowrap;
336 +#mediamanager__page .filelist .thumbs li .name {
340 +#mediamanager__page .filelist .thumbs li .date {
341 + font-style: italic;
342 + white-space: normal;
347 +#mediamanager__page .filelist .rows li {
350 + position: relative;
353 + margin-bottom: 3px;
354 + background-color: __background__;
359 +#mediamanager__page .filelist .rows li:nth-child(2n+1) {
360 + background-color: __background_neu__;
363 +#mediamanager__page .filelist .rows li dt {
367 + text-align: center;
370 +#mediamanager__page .filelist .rows li dt a {
375 +#mediamanager__page .filelist .rows li dt a img {
380 +#mediamanager__page .filelist .rows li .name,
381 +#mediamanager__page .filelist .rows li .size,
382 +#mediamanager__page .filelist .rows li .filesize,
383 +#mediamanager__page .filelist .rows li .date {
387 + white-space: nowrap;
390 +#mediamanager__page .filelist .rows li .name {
394 +#mediamanager__page .filelist .rows li .size,
395 +#mediamanager__page .filelist .rows li .filesize {
398 +#mediamanager__page .filelist .rows li .date {
400 + font-style: italic;
401 + white-space: normal;
404 +/*____________ Upload panel ____________*/
406 +#mediamanager__page div.upload {
407 + padding-bottom: 0.5em;
410 +#media__content #mediamanager__uploader {
411 + border-bottom: 1px solid __border__;
412 + padding-bottom: 0.5em;
415 +/*____________ File preview ____________*/
417 +#mediamanager__page .file ul.actions {
418 + text-align: center;
422 +#mediamanager__page .file ul.actions li {
426 +#mediamanager__page .file div.image {
427 + margin-bottom: 5px;
428 + text-align: center;
431 +#mediamanager__page .file div.image img {
435 +#mediamanager__page .file dl {
437 +#mediamanager__page .file dl dt {
440 + background-color: __background_alt__;
442 +#mediamanager__page .file dl dd {
444 + background-color: __background_neu__;
448 +/*____________ Meta data edit form ____________*/
450 +#mediamanager__page form.meta div.row {
451 + margin-bottom: 5px;
454 +#mediamanager__page form.meta label span {
458 +#mediamanager__page form.meta input {
462 +#mediamanager__page form.meta input.button {
466 +#mediamanager__page form.meta textarea.edit {
473 +/*____________ Revisions form ____________*/
475 +#mediamanager__page #page__revisions ul {
477 + list-style-type: none;
480 +#mediamanager__page #page__revisions ul li div.li div {
482 + color: __text_neu__;
483 + padding-left: 18px;
486 +#mediamanager__page #page__revisions ul li div.li input {
487 + position: relative;
493 +#mediamanager__diff table {
494 + table-layout: fixed;
497 +#mediamanager__diff td,
498 +#mediamanager__diff th {
500 + margin: 0 5px 10px 0;
502 + vertical-align: top;
506 +#mediamanager__diff th {
507 + font-weight: normal;
509 +#mediamanager__diff th a {
512 +#mediamanager__diff th span {
516 +#mediamanager__diff dl dd strong{
517 + background-color: __highlight__;
519 + font-weight: normal;
524 +#mediamanager__page .file form.diffView {
525 + margin-bottom: 10px;
529 +#mediamanager__diff div.slider {
534 +#mediamanager__diff .imageDiff {
535 + position: relative;
537 +#mediamanager__diff .imageDiff .image1,
538 +#mediamanager__diff .imageDiff .image2 {
539 + position: absolute;
545 +#mediamanager__diff .imageDiff.opacity .image2 {
547 + -khtml-opacity: 0.5;
551 +#mediamanager__diff .imageDiff.portions .image2 {
552 + border-right: 1px solid red;
556 +#mediamanager__diff .imageDiff img {
560 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
561 --- dokuwiki-2011-05-25a/lib/tpl/default/_mediaoptions.css 2011-06-14 22:58:54.000000000 +0300
562 +++ dokuwiki-rc2011-11-10/lib/tpl/default/_mediaoptions.css 2011-11-11 13:25:17.000000000 +0200
567 - background-color:__background__;
569 - border: 1px solid __border__;
570 - position: absolute;
572 +#media__popup_content p {
578 - font-weight:normal;
579 - background-color: __background_alt__;
581 - margin-bottom: 5px;
584 +#media__popup_content label {
593 +#media__popup_content .button {
602 -#media__popup label {
607 -#media__popup .button {
612 -#media__popup .btnlbl {
616 -#media__popup .btnlbl input {
624 -/* --- display options --- */
626 -#media__linkopts label,
633 -#media__linkopts label{
638 -#media__linkopts label.long{
639 - margin-bottom: 8px;
643 -#media__linkopts label.long{
648 -#media__linkopts br {
652 -#media__linkopts select {
657 -#media__linkopts input.edit {
661 -#media__linkopts #media__title {
663 +#media__popup_content input.button {
666 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
667 --- dokuwiki-2011-05-25a/lib/tpl/default/_tabs.css 1970-01-01 02:00:00.000000000 +0200
668 +++ dokuwiki-rc2011-11-10/lib/tpl/default/_tabs.css 2011-11-11 13:25:17.000000000 +0200
676 +.dokuwiki ul.tabs li {
683 +.dokuwiki ul.tabs li strong,
684 +.dokuwiki ul.tabs li a {
686 + padding: .3em .8em;
687 + margin: 0 .3em 0 0;
688 + background-color: __background_neu__;
690 + border-radius: .5em .5em 0 0;
692 +.dokuwiki ul.tabs li strong {
693 + font-weight: normal;
696 +.dokuwiki ul.tabs li a:link,
697 +.dokuwiki ul.tabs li a:visited {
699 +.dokuwiki ul.tabs li a:hover,
700 +.dokuwiki ul.tabs li a:active,
701 +.dokuwiki ul.tabs li a:focus,
702 +.dokuwiki ul.tabs li strong {
703 + background-color: __background_alt__;
705 + text-decoration: none;
707 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
708 --- dokuwiki-2011-05-25a/lib/tpl/default/design.css 2011-06-14 22:58:54.000000000 +0300
709 +++ dokuwiki-rc2011-11-10/lib/tpl/default/design.css 2011-11-11 13:25:17.000000000 +0200
714 +/* ----------- type of recent changes select -------- */
716 +div.dokuwiki form#dw__recent select {
717 + margin-bottom: 10px;
720 /* --------------- Links ------------------ */
723 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
724 --- dokuwiki-2011-05-25a/lib/tpl/default/detail.php 2011-06-14 22:58:54.000000000 +0300
725 +++ dokuwiki-rc2011-11-10/lib/tpl/default/detail.php 2011-11-11 13:25:17.000000000 +0200
729 <p>← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
731 + $imgNS = getNS($IMG);
732 + $authNS = auth_quickaclcheck("$imgNS:*");
733 + if ($authNS >= AUTH_UPLOAD) {
734 + echo '<p><a href="'.media_managerURL(array('ns' => $imgNS, 'image' => $IMG)).'">'.$lang['img_manager'].'</a></p>';
738 <dl class="img_tags">
740 - $t = tpl_img_getTag('Date.EarliestTime');
741 - if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
743 - $t = tpl_img_getTag('File.Name');
744 - if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
746 - $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'));
747 - if($t) print '<dt>'.$lang['img_artist'].':</dt><dd>'.hsc($t).'</dd>';
749 - $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'));
750 - if($t) print '<dt>'.$lang['img_copyr'].':</dt><dd>'.hsc($t).'</dd>';
752 - $t = tpl_img_getTag('File.Format');
753 - if($t) print '<dt>'.$lang['img_format'].':</dt><dd>'.hsc($t).'</dd>';
755 - $t = tpl_img_getTag('File.NiceSize');
756 - if($t) print '<dt>'.$lang['img_fsize'].':</dt><dd>'.hsc($t).'</dd>';
758 - $t = tpl_img_getTag('Simple.Camera');
759 - if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>';
761 - $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
762 - if($t) print '<dt>'.$lang['img_keywords'].':</dt><dd>'.hsc($t).'</dd>';
764 + $config_files = getConfigFiles('mediameta');
765 + foreach ($config_files as $config_file) {
766 + if(@file_exists($config_file)) include($config_file);
769 + foreach($fields as $key => $tag){
771 + if (!empty($tag[0])) $t = array($tag[0]);
772 + if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
773 + $value = tpl_img_getTag($t);
775 + echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
776 + if ($tag[2] == 'date') echo dformat($value);
777 + else echo hsc($value);
783 <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
784 Files dokuwiki-2011-05-25a/lib/tpl/default/images/UWEB.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/UWEB.png differ
785 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
786 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
787 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
788 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
789 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
790 Files dokuwiki-2011-05-25a/lib/tpl/default/images/resizecol.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/resizecol.png differ
791 Files dokuwiki-2011-05-25a/lib/tpl/default/images/tocdot2.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/tocdot2.gif differ
792 Files dokuwiki-2011-05-25a/lib/tpl/default/images/windows.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/windows.gif differ
793 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
794 --- dokuwiki-2011-05-25a/lib/tpl/default/main.php 2011-06-14 22:58:54.000000000 +0300
795 +++ dokuwiki-rc2011-11-10/lib/tpl/default/main.php 2011-11-11 13:25:17.000000000 +0200
799 <?php tpl_metaheaders()?>
801 - <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" />
802 + <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
804 <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
808 <div class="bar-right" id="bar__bottomright">
809 <?php tpl_button('subscribe')?>
810 + <?php tpl_button('media')?>
811 <?php tpl_button('admin')?>
812 <?php tpl_button('profile')?>
813 <?php tpl_button('login')?>
814 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
815 --- dokuwiki-2011-05-25a/lib/tpl/default/media.css 2011-06-14 22:58:54.000000000 +0300
816 +++ dokuwiki-rc2011-11-10/lib/tpl/default/media.css 2011-11-11 13:25:17.000000000 +0200
818 margin-bottom: 0.5em;
821 +#media__manager a.select {
825 /* --- Tree formatting --- */
828 @@ -141,12 +145,16 @@
829 padding: 0 0.5em 0.5em 0.5em;
832 -#media__content form#dw__upload,
833 -#media__content div#dw__flashupload {
834 +#media__content #mediamanager__uploader {
836 border-bottom: solid 1px __border__;
837 padding: 0 0.5em 1em 0.5em;
840 +#media__content form#dw__upload {
844 #media__content form#dw__upload fieldset {
847 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
848 --- dokuwiki-2011-05-25a/lib/tpl/default/style.ini 2011-06-14 22:58:54.000000000 +0300
849 +++ dokuwiki-rc2011-11-10/lib/tpl/default/style.ini 2011-11-11 13:25:17.000000000 +0200
852 _linkwiz.css = screen
853 _subscription.css = screen
854 +_mediamanager.css = screen
856 +_fileuploader.css = screen