From b87a370164b2bce9dd27c90713ac92b14ef194dd Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 4 Jan 2012 14:11:03 +0100 Subject: added new icons used http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ --- css/design.css | 55 +++++++++++++++++++++------ images/pagetools/arrow_redo.png | Bin 625 -> 0 bytes images/pagetools/arrow_up.png | Bin 372 -> 0 bytes images/pagetools/backlink-active.png | Bin 611 -> 1053 bytes images/pagetools/backlink.png | Bin 514 -> 998 bytes images/pagetools/create-active.png | Bin 0 -> 920 bytes images/pagetools/create.png | Bin 0 -> 885 bytes images/pagetools/edit-active.png | Bin 654 -> 845 bytes images/pagetools/edit.png | Bin 552 -> 807 bytes images/pagetools/email_star.png | Bin 739 -> 0 bytes images/pagetools/inbox-document-text.png | Bin 665 -> 0 bytes images/pagetools/page.png | Bin 635 -> 0 bytes images/pagetools/page_code.png | Bin 818 -> 0 bytes images/pagetools/pagetools.xcf | Bin 0 -> 11966 bytes images/pagetools/pencil.png | Bin 450 -> 0 bytes images/pagetools/pencil_add.png | Bin 742 -> 0 bytes images/pagetools/revert-active.png | Bin 0 -> 794 bytes images/pagetools/revert.png | Bin 0 -> 768 bytes images/pagetools/revisions-active.png | Bin 0 -> 1543 bytes images/pagetools/revisions.png | Bin 0 -> 1520 bytes images/pagetools/revs-active.png | Bin 813 -> 0 bytes images/pagetools/revs.png | Bin 717 -> 0 bytes images/pagetools/show-active.png | Bin 0 -> 455 bytes images/pagetools/show.png | Bin 0 -> 454 bytes images/pagetools/site_backup_and_restore.png | Bin 745 -> 0 bytes images/pagetools/source-active.png | Bin 0 -> 944 bytes images/pagetools/source.png | Bin 0 -> 921 bytes images/pagetools/subscribe-active.png | Bin 0 -> 769 bytes images/pagetools/subscribe.png | Bin 0 -> 750 bytes images/pagetools/time.png | Bin 793 -> 0 bytes images/pagetools/top-active.png | Bin 609 -> 506 bytes images/pagetools/top.png | Bin 528 -> 494 bytes 32 files changed, 43 insertions(+), 12 deletions(-) delete mode 100644 images/pagetools/arrow_redo.png delete mode 100644 images/pagetools/arrow_up.png create mode 100644 images/pagetools/create-active.png create mode 100644 images/pagetools/create.png delete mode 100644 images/pagetools/email_star.png delete mode 100644 images/pagetools/inbox-document-text.png delete mode 100644 images/pagetools/page.png delete mode 100644 images/pagetools/page_code.png create mode 100644 images/pagetools/pagetools.xcf delete mode 100644 images/pagetools/pencil.png delete mode 100644 images/pagetools/pencil_add.png create mode 100644 images/pagetools/revert-active.png create mode 100644 images/pagetools/revert.png create mode 100644 images/pagetools/revisions-active.png create mode 100644 images/pagetools/revisions.png delete mode 100644 images/pagetools/revs-active.png delete mode 100644 images/pagetools/revs.png create mode 100644 images/pagetools/show-active.png create mode 100644 images/pagetools/show.png delete mode 100644 images/pagetools/site_backup_and_restore.png create mode 100644 images/pagetools/source-active.png create mode 100644 images/pagetools/source.png create mode 100644 images/pagetools/subscribe-active.png create mode 100644 images/pagetools/subscribe.png delete mode 100644 images/pagetools/time.png diff --git a/css/design.css b/css/design.css index 388e50fc6..f798b03cc 100755 --- a/css/design.css +++ b/css/design.css @@ -206,30 +206,44 @@ #dokuwiki__pagetools ul li a.edit:focus { background-image: url(images/pagetools/edit-active.png); } + #dokuwiki__pagetools ul li a.show { - background-image: url(images/pagetools/page.png); + background-image: url(images/pagetools/show.png); } -#dokuwiki__pagetools ul li a.create { - background-image: url(images/pagetools/pencil_add.png); +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-image: url(images/pagetools/show-active.png); } + #dokuwiki__pagetools ul li a.source { - background-image: url(images/pagetools/page_code.png); + background-image: url(images/pagetools/source.png); +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-image: url(images/pagetools/source-active.png); } + #dokuwiki__pagetools ul li a.draft { - background-image: url(images/pagetools/inbox-document-text.png); + background-image: url(images/pagetools/draft.png); } -#dokuwiki__pagetools ul li a.revert { - background-image: url(images/pagetools/site_backup_and_restore.png); +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-image: url(images/pagetools/draft-active.png); } + #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revs.png); + background-image: url(images/pagetools/revisions.png); } #dokuwiki__pagetools ul li a.revs:hover, #dokuwiki__pagetools ul li a.revs:active, #dokuwiki__pagetools ul li a.revs:focus, .mode_revisions #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revs-active.png); + background-image: url(images/pagetools/revisions-active.png); } + #dokuwiki__pagetools ul li a.backlink { background-image: url(images/pagetools/backlink.png); } @@ -239,9 +253,7 @@ .mode_backlink #dokuwiki__pagetools ul li a.backlink { background-image: url(images/pagetools/backlink-active.png); } -#dokuwiki__pagetools ul li a.subscribe { - background-image: url(images/pagetools/email_star.png); -} + #dokuwiki__pagetools ul li a.top { background-image: url(images/pagetools/top.png); } @@ -251,6 +263,25 @@ background-image: url(images/pagetools/top-active.png); } +#dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/revert.png); +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/revert-active.png); +} + +#dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/subscribe.png); +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/subscribe-active.png); +} /*____________ site tools ____________*/ diff --git a/images/pagetools/arrow_redo.png b/images/pagetools/arrow_redo.png deleted file mode 100644 index fdc394c7c..000000000 Binary files a/images/pagetools/arrow_redo.png and /dev/null differ diff --git a/images/pagetools/arrow_up.png b/images/pagetools/arrow_up.png deleted file mode 100644 index 1ebb19324..000000000 Binary files a/images/pagetools/arrow_up.png and /dev/null differ diff --git a/images/pagetools/backlink-active.png b/images/pagetools/backlink-active.png index 9038de35b..85ef7b810 100644 Binary files a/images/pagetools/backlink-active.png and b/images/pagetools/backlink-active.png differ diff --git a/images/pagetools/backlink.png b/images/pagetools/backlink.png index 82bc7fd8a..ef173bbf1 100644 Binary files a/images/pagetools/backlink.png and b/images/pagetools/backlink.png differ diff --git a/images/pagetools/create-active.png b/images/pagetools/create-active.png new file mode 100644 index 000000000..c7ede442e Binary files /dev/null and b/images/pagetools/create-active.png differ diff --git a/images/pagetools/create.png b/images/pagetools/create.png new file mode 100644 index 000000000..46e1c4fcc Binary files /dev/null and b/images/pagetools/create.png differ diff --git a/images/pagetools/edit-active.png b/images/pagetools/edit-active.png index 57c9c63f8..31740052e 100644 Binary files a/images/pagetools/edit-active.png and b/images/pagetools/edit-active.png differ diff --git a/images/pagetools/edit.png b/images/pagetools/edit.png index 572a379b4..1f266a410 100644 Binary files a/images/pagetools/edit.png and b/images/pagetools/edit.png differ diff --git a/images/pagetools/email_star.png b/images/pagetools/email_star.png deleted file mode 100644 index 82608102e..000000000 Binary files a/images/pagetools/email_star.png and /dev/null differ diff --git a/images/pagetools/inbox-document-text.png b/images/pagetools/inbox-document-text.png deleted file mode 100644 index f56c8e47c..000000000 Binary files a/images/pagetools/inbox-document-text.png and /dev/null differ diff --git a/images/pagetools/page.png b/images/pagetools/page.png deleted file mode 100644 index 03ddd799f..000000000 Binary files a/images/pagetools/page.png and /dev/null differ diff --git a/images/pagetools/page_code.png b/images/pagetools/page_code.png deleted file mode 100644 index f7ea90419..000000000 Binary files a/images/pagetools/page_code.png and /dev/null differ diff --git a/images/pagetools/pagetools.xcf b/images/pagetools/pagetools.xcf new file mode 100644 index 000000000..2f534a6e7 Binary files /dev/null and b/images/pagetools/pagetools.xcf differ diff --git a/images/pagetools/pencil.png b/images/pagetools/pencil.png deleted file mode 100644 index 0bfecd50e..000000000 Binary files a/images/pagetools/pencil.png and /dev/null differ diff --git a/images/pagetools/pencil_add.png b/images/pagetools/pencil_add.png deleted file mode 100644 index edbebeed0..000000000 Binary files a/images/pagetools/pencil_add.png and /dev/null differ diff --git a/images/pagetools/revert-active.png b/images/pagetools/revert-active.png new file mode 100644 index 000000000..84422f985 Binary files /dev/null and b/images/pagetools/revert-active.png differ diff --git a/images/pagetools/revert.png b/images/pagetools/revert.png new file mode 100644 index 000000000..03ab808f8 Binary files /dev/null and b/images/pagetools/revert.png differ diff --git a/images/pagetools/revisions-active.png b/images/pagetools/revisions-active.png new file mode 100644 index 000000000..3ff7252c0 Binary files /dev/null and b/images/pagetools/revisions-active.png differ diff --git a/images/pagetools/revisions.png b/images/pagetools/revisions.png new file mode 100644 index 000000000..48d47c524 Binary files /dev/null and b/images/pagetools/revisions.png differ diff --git a/images/pagetools/revs-active.png b/images/pagetools/revs-active.png deleted file mode 100644 index 58ecaa021..000000000 Binary files a/images/pagetools/revs-active.png and /dev/null differ diff --git a/images/pagetools/revs.png b/images/pagetools/revs.png deleted file mode 100644 index 225daaf13..000000000 Binary files a/images/pagetools/revs.png and /dev/null differ diff --git a/images/pagetools/show-active.png b/images/pagetools/show-active.png new file mode 100644 index 000000000..9347bca1d Binary files /dev/null and b/images/pagetools/show-active.png differ diff --git a/images/pagetools/show.png b/images/pagetools/show.png new file mode 100644 index 000000000..3aedef4e5 Binary files /dev/null and b/images/pagetools/show.png differ diff --git a/images/pagetools/site_backup_and_restore.png b/images/pagetools/site_backup_and_restore.png deleted file mode 100644 index 467e441b0..000000000 Binary files a/images/pagetools/site_backup_and_restore.png and /dev/null differ diff --git a/images/pagetools/source-active.png b/images/pagetools/source-active.png new file mode 100644 index 000000000..c5b000237 Binary files /dev/null and b/images/pagetools/source-active.png differ diff --git a/images/pagetools/source.png b/images/pagetools/source.png new file mode 100644 index 000000000..bdf38ae95 Binary files /dev/null and b/images/pagetools/source.png differ diff --git a/images/pagetools/subscribe-active.png b/images/pagetools/subscribe-active.png new file mode 100644 index 000000000..aef1d0f44 Binary files /dev/null and b/images/pagetools/subscribe-active.png differ diff --git a/images/pagetools/subscribe.png b/images/pagetools/subscribe.png new file mode 100644 index 000000000..a6db22ccd Binary files /dev/null and b/images/pagetools/subscribe.png differ diff --git a/images/pagetools/time.png b/images/pagetools/time.png deleted file mode 100644 index 911da3f1d..000000000 Binary files a/images/pagetools/time.png and /dev/null differ diff --git a/images/pagetools/top-active.png b/images/pagetools/top-active.png index 9553896f2..c95789b55 100644 Binary files a/images/pagetools/top-active.png and b/images/pagetools/top-active.png differ diff --git a/images/pagetools/top.png b/images/pagetools/top.png index 82d6a8c06..3f37f5290 100644 Binary files a/images/pagetools/top.png and b/images/pagetools/top.png differ -- cgit v1.2.3 From 3d7fb39fd124400143b9fd776ad009233e42101b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:07:59 +0000 Subject: show sidebar only when it exists and in show mode (fixes #3 and #4) --- css/structure.css | 18 ++---------------- main.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/css/structure.css b/css/structure.css index 19f351620..4e3a14be8 100755 --- a/css/structure.css +++ b/css/structure.css @@ -42,29 +42,15 @@ body { margin: 0 1.5em 0 0; } - #dokuwiki__content { + .hasSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - #dokuwiki__content .pad { + .hasSidebar #dokuwiki__content .pad { margin-left: __sidebar_width__; } - /* don't show sidebar with fullscreen media manager or in the admin */ - .mode_media #dokuwiki__aside, - .mode_admin #dokuwiki__aside { - display: none; - } - .mode_media #dokuwiki__content, - .mode_media #dokuwiki__content .pad, - .mode_admin #dokuwiki__content, - .mode_admin #dokuwiki__content .pad { - float: none; - margin-left: 0; - margin-right: 0; - } - #dokuwiki__footer { clear: both; } diff --git a/main.php b/main.php index 0a0765065..e5552215d 100755 --- a/main.php +++ b/main.php @@ -12,6 +12,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +$showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); ?> are added to make it possible to e.g. style a page differently if it's in edit mode, see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
+
@@ -109,10 +110,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- -
- -
+ + +
+ +
+
-- cgit v1.2.3 From faefe2d963001701e6424e59b5423fb22d071808 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:08:25 +0000 Subject: RTL styling fixes --- css/rtl.css | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/css/rtl.css b/css/rtl.css index 8b82a45e1..5b6fa28bb 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -37,48 +37,75 @@ caption, legend { #dokuwiki__header .headings { float: right; + text-align: right; } #dokuwiki__header .tools { float: left; text-align: left; } -.mode_show #dokuwiki__aside { +#dokuwiki__aside { float: right; } #dokuwiki__aside .pad { margin: 0 0 0 1.5em; } -.mode_show #dokuwiki__content { +.hasSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } -.mode_show #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content .pad { margin-left: 0; margin-right: __sidebar_width__; } /*____________ design ____________*/ -#dokuwiki__header form.search #qsearch__in { - margin-right: 0; +#dokuwiki__header h1 img { + float: right; margin-left: .5em; + margin-right: 0; } -#dokuwiki__usertools ul li.user { - float: right; - margin-right: 0; +#dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; } -#dokuwiki__pagetools ul li a.action.top { - float: left; +#dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} + +#dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} + +#dokuwiki__sitetools { + text-align: left; } #dokuwiki__aside ul, #dokuwiki__aside ol { padding-right: 0; } +.dokuwiki .pageId { + right: auto; + left: -1em; +} + +.dokuwiki .docInfo { + text-align: left; +} + + +#dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + /*____________ content ____________*/ /* section indenting -- cgit v1.2.3 From cd6a1470058700ab34d11f7c701304873100256e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 01:23:51 +0000 Subject: make too wide content fit (fixes #7) --- css/basic.css | 3 +++ css/design.css | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/css/basic.css b/css/basic.css index 2ad21b6ca..793f5cca0 100755 --- a/css/basic.css +++ b/css/basic.css @@ -168,6 +168,9 @@ img { background-color: transparent; font-style: italic; } +img, object { + max-width: 100%; +} hr { border-top: solid __border__; diff --git a/css/design.css b/css/design.css index f798b03cc..f75df1140 100755 --- a/css/design.css +++ b/css/design.css @@ -358,6 +358,8 @@ #dokuwiki__aside .pad { line-height: 1.2; font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; } /* make sidebar more condensed */ @@ -419,6 +421,8 @@ border-radius: 2px; padding: 2em; margin-bottom: .5em; + overflow: hidden; + word-wrap: break-word; } .dokuwiki .docInfo { -- cgit v1.2.3 From 51152ba0d3fcb30765fdbe1c949b9663094b17a9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 01:26:44 +0000 Subject: changed some 'div.dokuwiki' to '.dokuwiki' --- css/_forms.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/css/_forms.css b/css/_forms.css index c7dc02d62..804584725 100755 --- a/css/_forms.css +++ b/css/_forms.css @@ -13,32 +13,32 @@ /* ---------------- forms ------------------------ */ -div.dokuwiki form { +.dokuwiki form { border: none; display: inline; } -div.dokuwiki label.block { +.dokuwiki label.block { display: block; text-align: right; font-weight: bold; } -div.dokuwiki label.simple { +.dokuwiki label.simple { display: block; text-align: left; font-weight: normal; } -div.dokuwiki label.block input.edit { +.dokuwiki label.block input.edit { width: 50%; } -div.dokuwiki label span { +.dokuwiki label span { vertical-align: middle; } -div.dokuwiki fieldset { +.dokuwiki fieldset { width: 400px; text-align: center; border: 1px solid __border__; @@ -47,11 +47,11 @@ div.dokuwiki fieldset { } -div.dokuwiki input.edit, -div.dokuwiki select.edit { +.dokuwiki input.edit, +.dokuwiki select.edit { vertical-align: middle; } -div.dokuwiki select.edit { +.dokuwiki select.edit { padding: 0.1em 0; } -- cgit v1.2.3 From 1204c0aadca651804aa56b88e9f9d4fa156e7445 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 8 Jan 2012 12:48:54 +0100 Subject: fixed icons for create and draft --- css/design.css | 9 +++++++++ images/pagetools/draft-active.png | Bin 0 -> 988 bytes images/pagetools/draft.png | Bin 0 -> 935 bytes images/pagetools/pagetools.xcf | Bin 11966 -> 13291 bytes 4 files changed, 9 insertions(+) create mode 100644 images/pagetools/draft-active.png create mode 100644 images/pagetools/draft.png diff --git a/css/design.css b/css/design.css index f75df1140..d32bc711b 100755 --- a/css/design.css +++ b/css/design.css @@ -207,6 +207,15 @@ background-image: url(images/pagetools/edit-active.png); } +#dokuwiki__pagetools ul li a.create { + background-image: url(images/pagetools/create.png); +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-image: url(images/pagetools/create-active.png); +} + #dokuwiki__pagetools ul li a.show { background-image: url(images/pagetools/show.png); } diff --git a/images/pagetools/draft-active.png b/images/pagetools/draft-active.png new file mode 100644 index 000000000..e4c0a6c72 Binary files /dev/null and b/images/pagetools/draft-active.png differ diff --git a/images/pagetools/draft.png b/images/pagetools/draft.png new file mode 100644 index 000000000..d44cc8c3f Binary files /dev/null and b/images/pagetools/draft.png differ diff --git a/images/pagetools/pagetools.xcf b/images/pagetools/pagetools.xcf index 2f534a6e7..ab4eaf634 100644 Binary files a/images/pagetools/pagetools.xcf and b/images/pagetools/pagetools.xcf differ -- cgit v1.2.3