Author: glen Date: Fri Jun 10 06:25:15 2011 GMT Module: packages Tag: HEAD ---- Log message: - update to 20110525
---- Files affected: packages/dokuwiki-tpl-sidebar: dokuwiki-tpl-sidebar.spec (1.17 -> 1.18) , dokuwiki-tpl-sidebar-20110525.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec diff -u packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec:1.17 packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec:1.18 --- packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec:1.17 Tue Dec 14 18:10:06 2010 +++ packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec Fri Jun 10 08:25:10 2011 @@ -3,8 +3,8 @@ Summary: Sidebar navigation with DokuWiki Summary(pl.UTF-8): Nawigacja po sidebarze przy użyciu DokuWiki Name: dokuwiki-tpl-sidebar -Version: 20101007 -Release: 2 +Version: 20110525 +Release: 1 License: GPL Group: Applications/WWW Source0: http://dokuwiki.jalakai.co.uk/template-sidebar-rc2009-01-26.zip @@ -13,6 +13,7 @@ Patch1: more-buttons.patch Patch2: acl-check.patch Patch3: http://glen.alkohol.ee/pld/%{name}-20101007.patch +Patch4: dokuwiki-tpl-sidebar-20110525.patch URL: http://www.dokuwiki.org/template:sidebar BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: unzip @@ -40,6 +41,7 @@ %prep %setup -q -n %{tpl} %patch3 -p4 +%patch4 -p6 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -79,6 +81,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2011/06/10 06:25:10 glen +- update to 20110525 + Revision 1.17 2010/12/14 17:10:06 glen - update dw patch against real 2010-11-07 release; rel 2 ================================================================ Index: packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar-20110525.patch diff -u /dev/null packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar-20110525.patch:1.1 --- /dev/null Fri Jun 10 08:25:15 2011 +++ packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar-20110525.patch Fri Jun 10 08:25:10 2011 @@ -0,0 +1,168 @@ +diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/_mediaoptions.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/_mediaoptions.css +--- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/_mediaoptions.css 2011-01-16 20:04:09.000000000 +0200 ++++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/_mediaoptions.css 2011-05-26 19:56:55.000000000 +0300 +@@ -5,7 +5,7 @@ + display:none; + border: 1px solid __border__; + position: absolute; +- width:270px; ++ width:280px; + } + + #media__popup h1 { +diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/design.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/design.css +--- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/design.css 2011-01-16 20:04:09.000000000 +0200 ++++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/design.css 2011-05-26 19:56:55.000000000 +0300 +@@ -85,8 +85,10 @@ + } + + div.dokuwiki textarea.edit { +- font-family: monospace; +- font-size: 14px; ++ font-family: monospace, serif; ++ /* second generic font fixes problem with font-size, see ++ http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ ++ font-size: 100%; + color: __text__; + background-color: __background__; + border: 1px solid __border__; +@@ -464,9 +466,14 @@ + padding-left: 3px; + } + ++div.dokuwiki pre, ++div.dokuwiki code { ++ font-family: monospace, serif; ++ /* second generic font fixes problem with font-size, see ++ http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ ++ font-size: 100%; ++} + div.dokuwiki pre { +- font-family: monospace; +- font-size: 120%; + padding: 0.5em; + border: 1px dashed __border__; + color: __text__; +@@ -519,11 +526,6 @@ + } + + +-/* inline code words */ +-div.dokuwiki code { +- font-size: 120%; +-} +- + /* inline tables */ + div.dokuwiki table.inline { + background-color: __background__; +@@ -652,10 +654,12 @@ + font-family: monospace; + font-size: 100%; + } +-div.dokuwiki td.diff-addedline { ++div.dokuwiki td.diff-addedline, ++div.dokuwiki span.diff-addedline { + background-color: #ddffdd; + } +-div.dokuwiki td.diff-deletedline { ++div.dokuwiki td.diff-deletedline, ++div.dokuwiki span.diff-deletedline { + background-color: #ffffbb; + } + div.dokuwiki td.diff-context { +diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/main.php ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/main.php +--- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/main.php 2011-01-16 20:04:09.000000000 +0200 ++++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/main.php 2011-05-26 19:56:55.000000000 +0300 +@@ -29,7 +29,7 @@ + + <?php tpl_metaheaders()?> + +- <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> ++ <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> + + <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> + </head> +@@ -92,7 +92,7 @@ + <!-- wikipage stop --> + </div> + +- <div class="clearer"> </div> ++ <div class="clearer"></div> + + <?php tpl_flush()?> + +diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/print.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/print.css +--- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/print.css 2011-01-16 20:04:09.000000000 +0200 ++++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/print.css 2011-05-26 19:56:55.000000000 +0300 +@@ -33,16 +33,11 @@ + text-align: right; + } + +- +-div.notify, +-div.info, +-div.success, +-div.error, +-div.breadcrumbs, +-div.secedit { ++div.breadcrumbs { + display: none; + } + ++ + /* --------------------- Text formating -------------------------------- */ + + /* external link */ +@@ -102,17 +97,16 @@ + margin: 3px; + } + ++/* the styles for media images are already in ++ lib/styles/all.css, these are additional styles */ + img.medialeft { +- border: 0; +- float: left; + margin: 0 1.5em 0 0; + } +- + img.mediaright { +- border: 0; +- float: right; + margin: 0 0 0 1.5em; + } ++img.mediacenter { ++} + + /* unordered lists */ + ul { +@@ -230,17 +224,5 @@ + border: 1px solid #000000; + } + +-.leftalign { +- text-align: left; +-} +- +-.centeralign { +- text-align: center; +-} +- +-.rightalign { +- text-align: right; +-} +- + .toc, .footerinc, .header, .bar, .user { display: none; } + +diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/rtl.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/rtl.css +--- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/rtl.css 2011-01-16 20:04:09.000000000 +0200 ++++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/rtl.css 2011-05-26 19:56:55.000000000 +0300 +@@ -55,8 +55,7 @@ + div.dokuwiki a.urlextern, + div.dokuwiki a.interwiki, + div.dokuwiki a.windows, +-div.dokuwiki a.mail, +-div.dokuwiki a.mail.JSnocheck { ++div.dokuwiki a.mail { + /* should work but doesn't - so we just disable icons here*/ + /* + background-position: right 1px; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-tpl-sidebar/dokuwiki-tpl-sidebar.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
