Merge pull request #169 from splitbrain/diff_navigation

Added diff navigation

6 files changed, 166 insertions, 3 deletions

diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 423d67449..88d8cd93d 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -83,7 +83,8 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
 
             // find the last non-spammy revision
             $data = '';
-            $old  = getRevisions($id, 0, $this->max_revs);
+            $pagelog = new PageChangeLog($id);
+            $old  = $pagelog->getRevisions(0, $this->max_revs);
             if(count($old)){
                 foreach($old as $REV){
                     $data = rawWiki($id,$REV);
diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css
index b7c82d829..bc56a37c4 100644
--- a/lib/tpl/dokuwiki/css/_diff.css
+++ b/lib/tpl/dokuwiki/css/_diff.css
@@ -73,3 +73,65 @@
     background-color: inherit;
     font-weight: bold;
 }
+
+/* diff options */
+
+.dokuwiki .diffoptions form {
+    float: left;
+}
+.dokuwiki .diffoptions p {
+    float: right;
+}
+
+/* diff nav */
+
+.dokuwiki table.diff_sidebyside td.diffnav {
+    padding-bottom: .7em;
+}
+.dokuwiki .diffnav a {
+    display: inline-block;
+    vertical-align: middle;
+}
+.dokuwiki .diffnav a span {
+    display: none;
+}
+
+.dokuwiki .diffnav a:hover,
+.dokuwiki .diffnav a:active,
+.dokuwiki .diffnav a:focus {
+    background-color: @ini_background_alt;
+    text-decoration: none;
+}
+
+.dokuwiki .diffnav a:before {
+    display: inline-block;
+    line-height: 1;
+    padding: .2em .4em;
+    border: 1px solid @ini_border;
+    border-radius: 2px;
+    color: @ini_text;
+}
+
+.dokuwiki .diffnav a.diffprevrev:before {
+    content: '\25C0'; /* left triangle */
+}
+.dokuwiki .diffnav a.diffnextrev:before,
+.dokuwiki .diffnav a.difflastrev:before {
+    content: '\25B6'; /* right triangle */
+}
+.dokuwiki .diffnav a.diffbothprevrev:before {
+    content: '\25C0\25C0';
+}
+.dokuwiki .diffnav a.diffbothnextrev:before {
+    content: '\25B6\25B6';
+}
+
+.dokuwiki .diffnav select {
+    width: 60%;
+    min-width: 9em;
+    height: 1.5em; /* height is necessary for longer options in Webkit */
+}
+
+.dokuwiki .diffnav select option[selected] {
+    font-weight: bold;
+}
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index c296185e9..ac9f6803a 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -455,6 +455,7 @@ input[disabled],
 button[disabled],
 select[disabled],
 textarea[disabled],
+option[disabled],
 input[readonly],
 button[readonly],
 select[readonly],
diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index 75ae5dbe4..c3e517795 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -275,11 +275,13 @@ body {
 #config__manager td .input,
 .dokuwiki fieldset,
 .dokuwiki input.edit,
-.dokuwiki textarea,
-.dokuwiki select {
+.dokuwiki textarea {
     width: auto !important;
     max-width: 100% !important;
 }
+.dokuwiki select {
+    max-width: 100% !important;
+}
 #config__manager fieldset {
     margin-left: 0;
     margin-right: 0;
diff --git a/lib/tpl/dokuwiki/css/sites/abcwiki.css b/lib/tpl/dokuwiki/css/sites/abcwiki.css
new file mode 100644
index 000000000..9f436516b
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/sites/abcwiki.css
@@ -0,0 +1,39 @@
+
+html,
+body {
+    background-color: #369;
+}
+
+#dokuwiki__header,
+#dokuwiki__aside,
+.docInfo,
+#dokuwiki__footer {
+    color: #fff;
+}
+
+#dokuwiki__header a,
+#dokuwiki__aside a,
+.docInfo a,
+#dokuwiki__footer a {
+    color: #ff9 !important;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    color: #036;
+}
+
+.dokuwiki div.breadcrumbs {
+    border-top-color: #999;
+    border-bottom-color: #666;
+}
+.dokuwiki div.breadcrumbs div:first-child {
+    border-bottom-color: #999;
+}
+.dokuwiki div.breadcrumbs div:last-child {
+    border-top-color: #666;
+}
diff --git a/lib/tpl/dokuwiki/css/sites/paralis.css b/lib/tpl/dokuwiki/css/sites/paralis.css
new file mode 100644
index 000000000..201bca936
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/sites/paralis.css
@@ -0,0 +1,58 @@
+
+@media screen {
+
+body {
+    font: normal 100%/1.4 Frutiger, Calibri, "Myriad Pro", Myriad, "Nimbus Sans L", Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif;
+    color: @ini_text_neu;
+}
+
+q {
+    font-style: italic;
+}
+
+#dokuwiki__header h1 a {
+    color: @ini_link;
+    font-weight: bold;
+}
+
+div.dokuwiki p.plugin__pagenav {
+    margin: 0 0 1.4em;
+}
+
+
+} /* /@media */
+
+
+#dokuwiki__header h1 {
+    position: relative;
+}
+#dokuwiki__header h1 img {
+    position: absolute;
+    top: -27px;
+    left: -33px;
+    max-width: none;
+}
+#dokuwiki__header h1 {
+    padding-left: 110px;
+}
+#dokuwiki__header p.claim {
+    padding-left: 110px;
+}
+
+
+@media print {
+
+.dokuwiki p.plugin__pagenav {
+    display: none;
+}
+
+} /* /@media */