Merge branch 'master' into future

* master: (162 commits)
  fixed revision JS for images
  upgraded SimplePie to 1.3.1 FS#2708
  removed obsolete browser plugin (migrate does it)
  adjust spacing to match standard 1.4em grid
  added comment on use of whitelist vs blacklist
  Updated idfilter() function for IIS
  use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
  added 'home' class to first link in hierarchical breadcrumbs
  reduced required max width to go into tablet mode
  re-added linear gradients for firefox
  added missing styling for disabled form elements (FS#2705)
  fixed acronyms in italics (FS#2684)
  improved print styles (includes fixes for FS#2645 and FS#2707)
  basic styles improvements
  Greek language update
  Use list in acl help text, for more structure
  Galician language update
  touch the config on save, even if no changes were made
  unwind the width narrowing commit
  put some whitespace between form submit button and fieldset bottom border
  ...

Conflicts:
	lib/plugins/config/admin.php
	lib/plugins/config/settings/config.class.php

7 files changed, 143 insertions, 64 deletions

diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 3c7172226..6744750ba 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -67,6 +67,19 @@
 .dokuwiki button.button {
     vertical-align: middle;
 }
+/**
+ * Styles for auth forms
+ */
+#dw__login label[for="remember__me"] {
+    margin-left: 50%;
+    margin-bottom: 1.4em;
+}
+#dw__login fieldset,
+#dw__resendpwd fieldset,
+#dw__register fieldset {
+    padding-bottom: 0.7em;
+}
+
 
 /**
  * Styles for the subscription page
diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 8b7447239..a0a60d295 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -28,15 +28,20 @@ body {
 
 /*____________ headers ____________*/
 
+caption,
+figcaption,
+summary,
+legend {
+    padding: 0;
+    margin: 0 0 .35em;
+    line-height: 1.2;
+}
 h1,
 h2,
 h3,
 h4,
 h5,
-h6,
-caption,
-legend {
-    font-family: Arial, sans-serif;
+h6 {
     font-weight: bold;
     padding: 0;
     line-height: 1.2;
@@ -47,9 +52,7 @@ legend {
 [dir=rtl] h3,
 [dir=rtl] h4,
 [dir=rtl] h5,
-[dir=rtl] h6,
-[dir=rtl] caption,
-[dir=rtl] legend {
+[dir=rtl] h6 {
     clear: right;
 }
 
@@ -90,6 +93,8 @@ pre,
 table,
 hr,
 blockquote,
+figure,
+details,
 fieldset,
 address {
     margin: 0 0 1.4em 0; /* bottom margin = line-height */
@@ -161,7 +166,6 @@ table {
 caption {
     caption-side: top;
     text-align: left;
-    margin: 0 0 .3em;
 }
 [dir=rtl] caption {
     text-align: right;
@@ -173,13 +177,12 @@ td {
     margin: 0;
     vertical-align: top;
     border: 1px solid __border__;
-    text-align: left;
 }
 th {
     font-weight: bold;
     background-color: __background_alt__;
+    text-align: left;
 }
-[dir=rtl] td,
 [dir=rtl] th {
     text-align: right;
 }
@@ -216,11 +219,15 @@ img {
     height: auto;
 }
 img,
-object {
+object,
+embed,
+iframe,
+video,
+audio {
     max-width: 100%;
 }
-/* IE8 and below won't display the images otherwise */
-button img {
+#IE7 img,
+#IE8 img {
     max-width: none;
 }
 
@@ -229,7 +236,6 @@ hr {
     border-bottom: solid __background__;
     border-width: 1px 0;
     height: 0;
-    width: 100%;
     text-align: center;
     clear: both;
 }
@@ -240,6 +246,15 @@ abbr {
     border-bottom: 1px dotted;
     font-style: normal;
 }
+em acronym,
+em abbr {
+    font-style: italic;
+}
+
+mark {
+    background-color: __highlight__;
+    color: inherit;
+}
 
 pre,
 code,
@@ -289,6 +304,10 @@ sup {
     vertical-align: super;
 }
 
+small {
+    font-size: .8em;
+}
+
 /*____________ forms ____________*/
 
 /* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */
@@ -299,9 +318,13 @@ form {
     padding: 0;
 }
 fieldset {
-    padding: 1em 1em 0;
+    padding: .7em 1em 0;
+    padding: .7rem 1rem; /* for those browsers understanding :last-child */
     border: 1px solid __text_alt__;
 }
+fieldset > :last-child {
+    margin-bottom: 0;
+}
 legend {
     margin: 0;
     padding: 0 .1em;
@@ -316,12 +339,16 @@ textarea,
 button,
 select,
 optgroup,
-option {
+option,
+keygen,
+output,
+meter,
+progress {
     font: inherit;
     font-weight: normal;
     color: #333;
     background-color: #fff;
-    line-height: 1;
+    line-height: normal;
     margin: 0;
     vertical-align: middle;
     -moz-box-sizing: border-box;
@@ -340,7 +367,8 @@ option {
 
 input,
 textarea,
-select {
+select,
+keygen {
     border: 1px solid #ccc;
     box-shadow: inset 0 0 1px #eee;
     border-radius: 2px;
@@ -350,11 +378,14 @@ input:focus,
 textarea:active,
 textarea:focus,
 select:active,
-select:focus {
+select:focus,
+keygen:active,
+keygen:focus {
     border-color: #999;
 }
 input[type=radio],
-input[type=checkbox] {
+input[type=checkbox],
+input[type=image] {
     padding: 0;
     border-style: none;
     box-shadow: none;
@@ -362,6 +393,8 @@ input[type=checkbox] {
 
 /* all types of buttons */
 input[type=submit],
+input[type=button],
+input[type=reset],
 input.button,
 a.button,
 button,
@@ -369,7 +402,7 @@ button,
     color: #333;
     background-color: #eee;
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
-    /*background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/
+    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
@@ -382,11 +415,18 @@ button,
 #IE7 input.button,
 #IE7 button {
     line-height: 1.4;
+    overflow: visible;
 }
 
 input[type=submit]:hover,
 input[type=submit]:active,
 input[type=submit]:focus,
+input[type=button]:hover,
+input[type=button]:active,
+input[type=button]:hover,
+input[type=reset]:hover,
+input[type=reset]:active,
+input[type=reset]:hover,
 input.button:hover,
 input.button:active,
 input.button:focus,
@@ -400,7 +440,7 @@ button:focus,
     border-color: #999;
     background-color: #ddd;
     background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
-    /*background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/
+    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
     background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
     background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
     background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
@@ -415,7 +455,13 @@ button::-moz-focus-inner {
 
 input[disabled],
 button[disabled],
+select[disabled],
+textarea[disabled],
 input[readonly],
-button[readonly] {
+button[readonly],
+select[readonly],
+textarea[readonly] {
     cursor: auto;
+    opacity: .5;
+    background-color: #eee;
 }
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index c23612643..119859e38 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -121,7 +121,7 @@
 .dokuwiki dl.code dt,
 .dokuwiki dl.file dt {
     background-color: __background_site__;
-    /* background: -moz-linear-gradient(   top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */
+    background: -moz-linear-gradient(   top, __background_alt__ 0%, __background_site__ 100%);
     background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%);
     background: -o-linear-gradient(     top, __background_alt__ 0%, __background_site__ 100%);
     background: -ms-linear-gradient(    top, __background_alt__ 0%, __background_site__ 100%);
diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index a40d525b3..60dc43fb1 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -53,6 +53,7 @@
     padding: 0;
     /* add transparent border to prevent jumping when proper border is added on hover */
     border: 1px solid transparent;
+    z-index: 10;
 }
 [dir=rtl] #dokuwiki__pagetools ul {
     right: auto;
diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index d30bc6c91..e0eaab848 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -5,18 +5,19 @@
  */
 
 body {
-    /*
-    font: normal 12pt/1.2 serif;
-    color: #000;
+    font: normal 87.5%/1.3 Garamond, Baskerville, "Hoefler Text", "Nimbus Roman No9 L", serif;
     background-color: #fff;
-    */
+    color: #000;
 }
 
 /* hide certain sections */
 .a11y,
+audio,
+video,
 #dokuwiki__header .tools,
 #dokuwiki__aside,
 .dokuwiki .breadcrumbs,
+.dokuwiki .pageId,
 #dw__toc,
 h3.toggle,
 #dokuwiki__pagetools,
@@ -24,37 +25,38 @@ h3.toggle,
     display: none;
 }
 
-.dokuwiki h1,
-.dokuwiki h2,
-.dokuwiki h3,
-.dokuwiki h4,
-.dokuwiki h5,
-.dokuwiki caption,
-.dokuwiki legend {
+h1,
+h2,
+h3,
+h4,
+h5,
+caption,
+legend {
     clear: both;
 }
-.dokuwiki ul {
+ul {
     list-style: disc outside;
 }
-.dokuwiki ol {
+ol {
     list-style: decimal outside;
 }
-.dokuwiki ol ol {
+ol ol {
     list-style-type: lower-alpha;
 }
-.dokuwiki ol ol ol {
+ol ol ol {
     list-style-type: upper-roman;
 }
-.dokuwiki ol ol ol ol {
+ol ol ol ol {
     list-style-type: upper-alpha;
 }
-.dokuwiki ol ol ol ol ol {
+ol ol ol ol ol {
     list-style-type: lower-roman;
 }
 
-.dokuwiki a:link,
-.dokuwiki a:visited {
-    text-decoration: underline;
+a:link,
+a:visited {
+    text-decoration: none;
+    border-bottom: 1pt dotted;
     color: #333;
     background-color: inherit;
 }
@@ -68,33 +70,37 @@ a.mail:after {
 }
 
 /* code blocks */
-.dokuwiki pre {
+pre {
     font-family: monospace;
 }
-.dokuwiki dl.code dt,
-.dokuwiki dl.file dt {
+dl.code dt,
+dl.file dt {
+    font-weight: bold;
+}
+
+mark {
     font-weight: bold;
 }
 
 /* images */
-.dokuwiki img {
+img {
     border-width: 0;
     vertical-align: middle;
 }
-.dokuwiki img.media {
+img.media {
     margin: .2em 0;
 }
-.dokuwiki img.medialeft {
+img.medialeft {
     margin: .2em 1em .2em 0;
 }
-.dokuwiki img.mediaright {
+img.mediaright {
     margin: .2em 0 .2em 1em;
 }
-.dokuwiki img.mediacenter {
+img.mediacenter {
     margin: .2em auto;
 }
 
-.dokuwiki blockquote {
+blockquote {
     padding: 0 10pt;
     margin: 0;
     border: solid #ccc;
@@ -105,27 +111,26 @@ a.mail:after {
 }
 
 /* tables */
-.dokuwiki table {
+table {
     border-collapse: collapse;
     empty-cells: show;
     border-spacing: 0;
     border: 1pt solid #ccc;
 }
-.dokuwiki th,
-.dokuwiki td {
+th,
+td {
     padding: 3pt 5pt;
     margin: 0;
     vertical-align: top;
     border: 1pt solid #666;
+}
+th {
+    font-weight: bold;
     text-align: left;
 }
-[dir=rtl] .dokuwiki th,
-[dir=rtl] .dokuwiki td {
+[dir=rtl] th {
     text-align: right;
 }
-.dokuwiki th {
-    font-weight: bold;
-}
 
 
 /*____________ a bit of layout ____________*/
@@ -138,6 +143,7 @@ a.mail:after {
 }
 #dokuwiki__header h1 a {
     text-decoration: none;
+    border-width: 0;
 }
 #dokuwiki__header h1 img {
     float: left;
@@ -148,8 +154,21 @@ a.mail:after {
     margin-right: 0;
     margin-left: .5em;
 }
+
 .dokuwiki div.footnotes {
     clear: both;
-    border-top: 1pt solid #000;
+    border-top: 1pt dotted #999;
     margin-top: 10pt;
 }
+
+.dokuwiki div.docInfo {
+    font-size: 90%;
+    text-align: right;
+    clear: both;
+    padding-top: 2pt;
+    border-top: 1pt solid #999;
+    margin-top: 10pt;
+}
+[dir=rtl] .dokuwiki div.docInfo {
+    text-align: left;
+}
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 67fbb3065..77bb98236 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -75,5 +75,5 @@ __missing__         = "#d30"
 __site_width__      = "75em"
 __sidebar_width__   = "16em"
 ; cut off points for mobile devices
-__tablet_width__    = "979px"
+__tablet_width__    = "800px"
 __phone_width__     = "480px"
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 0704aa271..19d165059 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -20,7 +20,7 @@ if (!defined('DOKU_INC')) die();
         <h1><?php
             // get logo either out of the template images folder or data/media folder
             $logoSize = array();
-            $logo = tpl_getMediaFile(array(':wiki:logo.png', 'images/logo.png'), false, $logoSize);
+            $logo = tpl_getMediaFile(array(':wiki:logo.png', ':logo.png', 'images/logo.png'), false, $logoSize);
 
             // display logo and wiki title in a link to the home page
             tpl_link(