]> git.pld-linux.org Git - packages/dokuwiki-tpl-sidebar.git/blame - dokuwiki-tpl-sidebar-20111110.patch
projects / packages / dokuwiki-tpl-sidebar.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- add images/button-pld.png link
[packages/dokuwiki-tpl-sidebar.git] / dokuwiki-tpl-sidebar-20111110.patch
CommitLineData
0a49fca7
ER		 1diff -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
4@@ -0,0 +1,111 @@
5+
6+.qq-uploader {
7+ position: relative;
8+ width: 100%;
9+}
10+
11+.qq-uploader .error {
12+ color: #f00;
13+ background-color: #fff;
14+}
15+
16+/* select file button */
17+
18+.qq-upload-button {
19+ display: inline-block;
20+ border: 1px solid __border__;
21+ color: __text__;
22+ background: __background__ url(images/buttonshadow.png) repeat-x bottom;
23+ text-decoration: none;
24+ font-size: 100%;
25+ cursor: pointer;
26+ margin: 1px 1px 5px;
27+ padding: 0.125em 0.4em;
28+}
29+
30+* html .qq-upload-button,
31+*+html .qq-upload-button {
32+ display: inline;
33+}
34+
35+.qq-upload-button-focus {
36+ outline: 1px dotted;
37+}
38+
39+/* drop area */
40+
41+.qq-upload-drop-area {
42+ position: absolute;
43+ top: 0;
44+ left: 0;
45+ width: 100%;
46+ height: 100%;
47+ min-height: 70px;
48+ z-index: 2;
49+ background: __background_neu__;
50+ color: __text__;
51+ text-align: center;
52+}
53+
54+.qq-upload-drop-area span {
55+ display: block;
56+ position: absolute;
57+ top: 50%;
58+ width: 100%;
59+ margin-top: -8px;
60+ font-size: 120%;
61+}
62+
63+.qq-upload-drop-area-active {
64+ background: __background_alt__;
65+}
66+
67+/* list of files to upload */
68+
69+div.qq-uploader ul {
70+ margin: 0;
71+ list-style: none;
72+}
73+
74+.qq-uploader li {
75+ margin-bottom: 5px;
76+ color: __text__;
77+}
78+
79+.qq-uploader li span,
80+.qq-uploader li input,
81+.qq-uploader li a {
82+ margin-right: 5px;
83+}
84+
85+.qq-upload-file {
86+ display: block;
87+ font-weight: bold;
88+}
89+
90+.qq-upload-spinner {
91+ display: inline-block;
92+ background: url("../../images/throbber.gif");
93+ width: 15px;
94+ height: 15px;
95+ vertical-align: text-bottom;
96+}
97+
98+.qq-upload-size,
99+.qq-upload-cancel {
100+ font-size: 85%;
101+}
102+
103+.qq-upload-failed-text {
104+ display: none;
105+}
106+.qq-upload-fail .qq-upload-failed-text {
107+ display: inline;
108+}
109+
110+.qq-action-container * {
111+ vertical-align: middle;
112+}
113+.qq-overwrite-check input {
114+ margin-left: 10px;
115+}
116diff -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
119@@ -16,6 +16,7 @@
120 background-color: __background_alt__;
121 height: 16px;
122 margin-bottom: 5px;
123+ cursor: move;
124 }
125
126 #link__wiz_close {
127diff -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
130@@ -0,0 +1,429 @@
131+
132+/*____________ Layout ____________*/
133+
134+#mediamanager__page h1 {
135+ margin: 0 0 .5em;
136+}
137+
138+#mediamanager__page {
139+ min-width: 800px;
140+ width: 100%;
141+ text-align: left;
142+}
143+
144+#mediamanager__page .panel {
145+ float: left;
146+}
147+
148+#mediamanager__page .namespaces {
149+ width: 15%;
150+ min-width: 120px;
151+}
152+#mediamanager__page .filelist {
153+ width: 50%;
154+ min-width: 400px;
155+}
156+#mediamanager__page .file {
157+ width: 35%;
158+ min-width: 280px;
159+}
160+
161+#mediamanager__page .panelHeader {
162+ background-color: __background_alt__;
163+ margin: 0 10px 10px 0;
164+ padding: 10px 10px 8px;
165+ text-align: left;
166+ min-height: 20px;
167+ overflow: hidden;
168+}
169+
170+#mediamanager__page .panelContent {
171+ overflow-y: auto;
172+ overflow-x: hidden;
173+ padding: 0;
174+ margin: 0 10px 10px 0;
175+ position: relative;
176+}
177+
178+#mediamanager__page .file .panelHeader,
179+#mediamanager__page .file .panelContent {
180+ margin-right: 0;
181+}
182+
183+#mediamanager__page .ui-resizable-e {
184+ width: 6px;
185+ right: 2px;
186+ background: transparent url(images/resizecol.png) center center no-repeat;
187+}
188+#mediamanager__page .ui-resizable-e:hover {
189+ background-color: __background_alt__;
190+}
191+
192+/*____________ Namespaces tree ____________*/
193+
194+#mediamanager__page .namespaces h2 {
195+ font-size: 1em;
196+ display: inline-block;
197+ border-width: 0;
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__;
203+ color: __text__;
204+ line-height: 1.5em;
205+}
206+* html #mediamanager__page .namespaces h2,
207+*+html #mediamanager__page .namespaces h2 {
208+ display: inline;
209+}
210+
211+#mediamanager__page .namespaces ul {
212+ margin-left: .2em;
213+ list-style: none;
214+}
215+#mediamanager__page .namespaces ul ul {
216+ margin-left: 1em;
217+}
218+
219+#mediamanager__page .namespaces ul .selected {
220+ background-color: __highlight__;
221+ font-weight: bold;
222+}
223+
224+/*____________ Panel header ____________*/
225+
226+#mediamanager__page .panelHeader h3 {
227+ float: left;
228+ font-weight: normal;
229+ font-size: 1em;
230+ padding: 0;
231+ margin: 0 0 3px;
232+}
233+
234+#mediamanager__page .panelHeader form.options {
235+ float: right;
236+ margin-top: -3px;
237+}
238+
239+#mediamanager__page .panelHeader ul {
240+ list-style: none;
241+ margin: 0;
242+ padding: 0;
243+}
244+#mediamanager__page .panelHeader ul li {
245+ color: __text__;
246+ float: left;
247+ line-height: 1;
248+ padding-left: 3px;
249+}
250+
251+#mediamanager__page .panelHeader ul li.listType {
252+ padding-left: 30px;
253+ background: url('../../images/icon-list.png') 3px 1px no-repeat;
254+}
255+#mediamanager__page .panelHeader ul li.sortBy {
256+ padding-left: 30px;
257+ background: url('../../images/icon-sort.png') 3px 1px no-repeat;
258+}
259+
260+#mediamanager__page .panelHeader form.options .ui-buttonset label{
261+ font-size: 90%;
262+ margin-right: -0.4em;
263+}
264+#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
265+ padding: .4em .7em;
266+ line-height: 1;
267+}
268+
269+/*____________ File list ____________*/
270+
271+#mediamanager__page .filelist ul {
272+ padding: 0;
273+ margin: 0;
274+}
275+
276+#mediamanager__page .filelist .panelContent ul li:hover {
277+ background-color: __background_alt__;
278+}
279+
280+#mediamanager__page .filelist li dt a {
281+ vertical-align: middle;
282+ display: table-cell;
283+ overflow: hidden;
284+}
285+* html #mediamanager__page .filelist .thumbs li dt a,
286+*+html #mediamanager__page .filelist .thumbs li dt a {
287+ display: block;
288+}
289+* html #mediamanager__page .filelist .rows li dt a,
290+*+html #mediamanager__page .filelist .rows li dt a {
291+ display: inline;
292+}
293+
294+/* thumbs */
295+
296+#mediamanager__page .filelist .thumbs li {
297+ width: 100px;
298+ min-height: 130px;
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__;
304+ color: __text__;
305+ padding: 5px;
306+ vertical-align: top;
307+ text-align: center;
308+ position: relative;
309+ line-height: 1.2;
310+}
311+* html #mediamanager__page .filelist .thumbs li,
312+*+html #mediamanager__page .filelist .thumbs li {
313+ display: inline;
314+ zoom: 1;
315+}
316+
317+#mediamanager__page .filelist .thumbs li dt a {
318+ width: 100px;
319+ height: 90px;
320+}
321+
322+#mediamanager__page .filelist .thumbs li dt a img {
323+ max-width: 90px;
324+ max-height: 90px;
325+}
326+
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 {
331+ display: block;
332+ overflow: hidden;
333+ width: 90px;
334+ white-space: nowrap;
335+}
336+#mediamanager__page .filelist .thumbs li .name {
337+ padding: 5px 0;
338+ font-weight: bold;
339+}
340+#mediamanager__page .filelist .thumbs li .date {
341+ font-style: italic;
342+ white-space: normal;
343+}
344+
345+/* rows */
346+
347+#mediamanager__page .filelist .rows li {
348+ list-style: none;
349+ display: block;
350+ position: relative;
351+ max-height: 50px;
352+ margin: 0;
353+ margin-bottom: 3px;
354+ background-color: __background__;
355+ color: __text__;
356+ overflow: hidden;
357+}
358+
359+#mediamanager__page .filelist .rows li:nth-child(2n+1) {
360+ background-color: __background_neu__;
361+}
362+
363+#mediamanager__page .filelist .rows li dt {
364+ float: left;
365+ width: 10%;
366+ height: 40px;
367+ text-align: center;
368+}
369+
370+#mediamanager__page .filelist .rows li dt a {
371+ width: 100px;
372+ height: 40px;
373+}
374+
375+#mediamanager__page .filelist .rows li dt a img {
376+ max-width: 40px;
377+ max-height: 40px;
378+}
379+
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 {
384+ overflow: hidden;
385+ float: left;
386+ margin-left: 1%;
387+ white-space: nowrap;
388+}
389+
390+#mediamanager__page .filelist .rows li .name {
391+ width: 30%;
392+ font-weight: bold;
393+}
394+#mediamanager__page .filelist .rows li .size,
395+#mediamanager__page .filelist .rows li .filesize {
396+ width: 15%;
397+}
398+#mediamanager__page .filelist .rows li .date {
399+ width: 20%;
400+ font-style: italic;
401+ white-space: normal;
402+}
403+
404+/*____________ Upload panel ____________*/
405+
406+#mediamanager__page div.upload {
407+ padding-bottom: 0.5em;
408+}
409+
410+#media__content #mediamanager__uploader {
411+ border-bottom: 1px solid __border__;
412+ padding-bottom: 0.5em;
413+}
414+
415+/*____________ File preview ____________*/
416+
417+#mediamanager__page .file ul.actions {
418+ text-align: center;
419+ margin: 0 0 5px;
420+ list-style: none;
421+}
422+#mediamanager__page .file ul.actions li {
423+ display: inline;
424+}
425+
426+#mediamanager__page .file div.image {
427+ margin-bottom: 5px;
428+ text-align: center;
429+}
430+
431+#mediamanager__page .file div.image img {
432+ width: 100%;
433+}
434+
435+#mediamanager__page .file dl {
436+}
437+#mediamanager__page .file dl dt {
438+ font-weight: bold;
439+ display: block;
440+ background-color: __background_alt__;
441+}
442+#mediamanager__page .file dl dd {
443+ display: block;
444+ background-color: __background_neu__;
445+}
446+
447+
448+/*____________ Meta data edit form ____________*/
449+
450+#mediamanager__page form.meta div.row {
451+ margin-bottom: 5px;
452+}
453+
454+#mediamanager__page form.meta label span {
455+ display: block;
456+}
457+
458+#mediamanager__page form.meta input {
459+ width: 50%;
460+}
461+
462+#mediamanager__page form.meta input.button {
463+ width: auto;
464+}
465+
466+#mediamanager__page form.meta textarea.edit {
467+ height: 6em;
468+ width: 95%;
469+ min-width: 95%;
470+ max-width: 95%;
471+}
472+
473+/*____________ Revisions form ____________*/
474+
475+#mediamanager__page #page__revisions ul {
476+ margin-left: 10px;
477+ list-style-type: none;
478+}
479+
480+#mediamanager__page #page__revisions ul li div.li div {
481+ font-size: 90%;
482+ color: __text_neu__;
483+ padding-left: 18px;
484+}
485+
486+#mediamanager__page #page__revisions ul li div.li input {
487+ position: relative;
488+ top: 1px;
489+}
490+
491+/* File diff */
492+
493+#mediamanager__diff table {
494+ table-layout: fixed;
495+}
496+
497+#mediamanager__diff td,
498+#mediamanager__diff th {
499+ width: 48%;
500+ margin: 0 5px 10px 0;
501+ padding: 0;
502+ vertical-align: top;
503+ text-align: left;
504+}
505+
506+#mediamanager__diff th {
507+ font-weight: normal;
508+}
509+#mediamanager__diff th a {
510+ font-weight: bold;
511+}
512+#mediamanager__diff th span {
513+ font-size: 90%;
514+}
515+
516+#mediamanager__diff dl dd strong{
517+ background-color: __highlight__;
518+ color: __text__;
519+ font-weight: normal;
520+}
521+
522+/* Image diff */
523+
524+#mediamanager__page .file form.diffView {
525+ margin-bottom: 10px;
526+ display: block;
527+}
528+
529+#mediamanager__diff div.slider {
530+ margin: 10px;
531+ width: 95%;
532+}
533+
534+#mediamanager__diff .imageDiff {
535+ position: relative;
536+}
537+#mediamanager__diff .imageDiff .image1,
538+#mediamanager__diff .imageDiff .image2 {
539+ position: absolute;
540+ top: 0;
541+ left: 0;
542+ width: 97%;
543+}
544+
545+#mediamanager__diff .imageDiff.opacity .image2 {
546+ -moz-opacity: 0.5;
547+ -khtml-opacity: 0.5;
548+ opacity: 0.5;
549+}
550+
551+#mediamanager__diff .imageDiff.portions .image2 {
552+ border-right: 1px solid red;
553+ overflow: hidden;
554+}
555+
556+#mediamanager__diff .imageDiff img {
557+ width: 100%;
558+}
559+
560diff -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
563@@ -1,92 +1,18 @@
564-/* --- popup --- */
565
566-#media__popup {
567- background-color:__background__;
568- display:none;
569- border: 1px solid __border__;
570- position: absolute;
571- width:280px;
572+#media__popup_content p {
573+ margin: 0 0 .5em;
574 }
575
576-#media__popup h1 {
577- text-align:center;
578- font-weight:normal;
579- background-color: __background_alt__;
580- height: 16px;
581- margin-bottom: 5px;
582- font-size:12px;
583- border-bottom: 0;
584+#media__popup_content label {
585+ float: left;
586+ width: 9em;
587 }
588
589-#media__popup p {
590- display:block;
591- line-height:14pt;
592- margin:0.5em;
593+#media__popup_content .button {
594+ margin-right: 1px;
595+ cursor: pointer;
596 }
597
598-#media_nolink {
599- padding:4px 0;
600-}
601-
602-#media__popup label {
603- float:left;
604- width:9em;
605-}
606-
607-#media__popup .button {
608- margin-left:auto;
609- margin-right:auto;
610-}
611-
612-#media__popup .btnlbl {
613- text-align:center;
614-}
615-
616-#media__popup .btnlbl input {
617- margin:0 1em;
618-}
619-
620-#media__closeimg {
621- float:right;
622-}
623-
624-/* --- display options --- */
625-
626-#media__linkopts label,
627-#media__nolnk {
628- width: 80px;
629- float: left;
630- margin-left: 10px;
631-}
632-
633-#media__linkopts label{
634- line-height: 20px;
635-}
636-
637-#media__nolnk,
638-#media__linkopts label.long{
639- margin-bottom: 8px;
640- line-height: 12px;
641-}
642-
643-#media__linkopts label.long{
644- width: 150px;
645- float: none;
646-}
647-
648-#media__linkopts br {
649- clear: both;
650-}
651-
652-#media__linkopts select {
653- width: 60px;
654- margin-left: 10px;
655-}
656-
657-#media__linkopts input.edit {
658- width:50px;
659- margin-left:10px;
660-}
661-#media__linkopts #media__title {
662- width:150px;
663+#media__popup_content input.button {
664+ margin-left: 9em;
665 }
666diff -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
669@@ -0,0 +1,37 @@
670+
671+.dokuwiki ul.tabs {
672+ padding: 0;
673+ margin: 0;
674+ overflow: hidden;
675+}
676+.dokuwiki ul.tabs li {
677+ float: left;
678+ padding: 0;
679+ margin: 0;
680+ list-style: none;
681+}
682+
683+.dokuwiki ul.tabs li strong,
684+.dokuwiki ul.tabs li a {
685+ float: left;
686+ padding: .3em .8em;
687+ margin: 0 .3em 0 0;
688+ background-color: __background_neu__;
689+ color: __text__;
690+ border-radius: .5em .5em 0 0;
691+}
692+.dokuwiki ul.tabs li strong {
693+ font-weight: normal;
694+}
695+
696+.dokuwiki ul.tabs li a:link,
697+.dokuwiki ul.tabs li a:visited {
698+}
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__;
704+ color: __text__;
705+ text-decoration: none;
706+}
707diff -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
710@@ -246,6 +246,12 @@
711 width: 49%
712 }
713
714+/* ----------- type of recent changes select -------- */
715+
716+div.dokuwiki form#dw__recent select {
717+ margin-bottom: 10px;
718+}
719+
720 /* --------------- Links ------------------ */
721
722 div.dokuwiki a:link,
723diff -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
726@@ -49,33 +49,33 @@
727 </p>
728
729 <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
730+ <?php
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>';
735+ }
736+ ?>
737
738 <dl class="img_tags">
739 <?php
740- $t = tpl_img_getTag('Date.EarliestTime');
741- if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
742-
743- $t = tpl_img_getTag('File.Name');
744- if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
745-
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>';
748-
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>';
751-
752- $t = tpl_img_getTag('File.Format');
753- if($t) print '<dt>'.$lang['img_format'].':</dt><dd>'.hsc($t).'</dd>';
754-
755- $t = tpl_img_getTag('File.NiceSize');
756- if($t) print '<dt>'.$lang['img_fsize'].':</dt><dd>'.hsc($t).'</dd>';
757-
758- $t = tpl_img_getTag('Simple.Camera');
759- if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>';
760-
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>';
763-
764+ $config_files = getConfigFiles('mediameta');
765+ foreach ($config_files as $config_file) {
766+ if(@file_exists($config_file)) include($config_file);
767+ }
768+
769+ foreach($fields as $key => $tag){
770+ $t = array();
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);
774+ if ($value) {
775+ echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
776+ if ($tag[2] == 'date') echo dformat($value);
777+ else echo hsc($value);
778+ echo '</dd>';
779+ }
780+ }
781 ?>
782 </dl>
783 <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
784Files dokuwiki-2011-05-25a/lib/tpl/default/images/UWEB.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/UWEB.png differ
785Files 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
786Files dokuwiki-2011-05-25a/lib/tpl/default/images/button-cc.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/button-cc.gif differ
787Files dokuwiki-2011-05-25a/lib/tpl/default/images/button-rss.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/button-rss.png differ
788Files dokuwiki-2011-05-25a/lib/tpl/default/images/link_icon.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/link_icon.gif differ
789Files dokuwiki-2011-05-25a/lib/tpl/default/images/mail_icon.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/mail_icon.gif differ
790Files dokuwiki-2011-05-25a/lib/tpl/default/images/resizecol.png and dokuwiki-rc2011-11-10/lib/tpl/default/images/resizecol.png differ
791Files dokuwiki-2011-05-25a/lib/tpl/default/images/tocdot2.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/tocdot2.gif differ
792Files dokuwiki-2011-05-25a/lib/tpl/default/images/windows.gif and dokuwiki-rc2011-11-10/lib/tpl/default/images/windows.gif differ
793diff -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
796@@ -28,8 +28,7 @@
797 </title>
798
799 <?php tpl_metaheaders()?>
800-
801- <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" />
802+ <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
803
804 <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
805 </head>
806@@ -117,6 +116,7 @@
807 </div>
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')?>
814diff -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
817@@ -32,6 +32,10 @@
818 margin-bottom: 0.5em;
819 }
820
821+#media__manager a.select {
822+ cursor: pointer;
823+}
824+
825 /* --- Tree formatting --- */
826
827 #media__tree img {
828@@ -141,12 +145,16 @@
829 padding: 0 0.5em 0.5em 0.5em;
830 }
831
832-#media__content form#dw__upload,
833-#media__content div#dw__flashupload {
834+#media__content #mediamanager__uploader {
835 display: block;
836 border-bottom: solid 1px __border__;
837 padding: 0 0.5em 1em 0.5em;
838 }
839+
840+#media__content form#dw__upload {
841+ border-bottom: 0;
842+}
843+
844 #media__content form#dw__upload fieldset {
845 padding: 0;
846 margin: 0;
847diff -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
850@@ -15,6 +15,9 @@
851 _admin.css = screen
852 _linkwiz.css = screen
853 _subscription.css = screen
854+_mediamanager.css = screen
855+_tabs.css = screen
856+_fileuploader.css = screen
857
858 rtl.css = rtl
859 print.css = print
Sidebar navigation with DokuWiki
This page took 0.230378 seconds and 4 git commands to generate.