print style finetuning

arsava · Feb 19, 2013 · 22dbb97 · 22dbb97
1 parent dbba3fd
commit 22dbb97
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/conf/boxes.php b/conf/boxes.php
@@ -229,7 +229,7 @@
         $_vector_boxes["p-qrcode"]["headline"] = $lang["vector_qrcodebox"];
 
         //content
-        $_vector_boxes["p-qrcode"]["xhtml"] = "        <span id=\"t-qrcode\"><a href=\"http://goqr.me/".(($conf["lang"] == "de") ? "de/" : "")."\" target=\"_blank\"><img src=\"".((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on") ? "https" : "http")."://api.qrserver.com/v1/create-qr-code/?data=".urlencode(wl(cleanID(getId()), false, true, "&"))."&#38;size=130x130&#38;margin=0&#38;bgcolor=f3f3f3\" alt=\"".hsc($lang["vector_qrcodebox_qrcode"])." ".hsc(tpl_pagetitle(null, true))." (".hsc($lang["vector_qrcodebox_genforcurrentpage"]).")\" title=\"".hsc($lang["vector_qrcodebox_urlofcurrentpage"])."\" /></a></span>";
+        $_vector_boxes["p-qrcode"]["xhtml"] = "        <span id=\"t-qrcode\"><a href=\"http://".(($conf["lang"] !== "de") ? "goqr.me" : "qr-code-generator.de")."/\" target=\"_blank\"><img src=\"".((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on") ? "https" : "http")."://api.qrserver.com/v1/create-qr-code/?data=".urlencode(wl(cleanID(getId()), false, true, "&"))."&#38;size=130x130&#38;margin=0&#38;bgcolor=f3f3f3\" alt=\"".hsc($lang["vector_qrcodebox_qrcode"])." ".hsc(tpl_pagetitle(null, true))." (".hsc($lang["vector_qrcodebox_genforcurrentpage"]).")\" title=\"".hsc($lang["vector_qrcodebox_urlofcurrentpage"])."\" /></a></span>";
     }
 
 }else{

diff --git a/conf/buttons.php b/conf/buttons.php
@@ -46,7 +46,7 @@
 
 
 //"vector for DokuWiki" button
-//Note: You are NOT allowed to remove this button. Please respect this!
+//Note: do NOT remove this button. Please respect this. :-)
 $_vector_btns["vecfdw"]["img"]      = DOKU_TPL."static/img/button-vector.png";
 $_vector_btns["vecfdw"]["href"]     = "http://syn-systems.com/";
 $_vector_btns["vecfdw"]["width"]    = 80;
@@ -67,8 +67,9 @@
 
 
 //QR Code button
+//Note: do NOT remove this button. Please respect this. :-)
 $_vector_btns["qrcode"]["img"]      = DOKU_TPL."static/img/button-qrcode.png";
-$_vector_btns["qrcode"]["href"]     = "http://goqr.me/".(($conf["lang"] == "de") ? "de/" : "");
+$_vector_btns["qrcode"]["href"]     = "http://".(($conf["lang"] !== "de") ? "goqr.me" : "qr-code-generator.de")."/";
 $_vector_btns["qrcode"]["width"]    = 80;
 $_vector_btns["qrcode"]["height"]   = 15;
 $_vector_btns["qrcode"]["title"]    = $lang["vector_qrcodebtn"];

diff --git a/main.php b/main.php
@@ -780,7 +780,7 @@ function _vector_renderButtons($arr)
 <!-- end page-container -->
 
 <!-- start footer -->
-<div id="footer">
+<div id="footer" class="noprint">
   <ul id="footer-info">
     <li id="footer-info-lastmod">
       <?php tpl_pageinfo()?><br />
@@ -840,7 +840,7 @@ function _vector_renderButtons($arr)
     }
     ?>
   </ul>
-  <ul id="footer-places" class="noprint">
+  <ul id="footer-places">
     <li><?php
         //show buttons, see vector/user/buttons.php to configure them
         if (!empty($_vector_btns) &&

diff --git a/static/css/print.css b/static/css/print.css
@@ -53,19 +53,17 @@ div#content .dokuwiki dl.file dt {
 
 /* misc tweaks */
 div#content,
-div#footer,
 div#bodyContent {
   margin-left: 0;
   border: 0 none;
   font-size: 1em;
 }
-div#footer {
-  border-top: 1px solid black;
-  margin-top: 0.5em;
-  padding: 0.75em;
-  background: none;
-}
 body {
   background-image: none;
   background-color: #fff;
 }
+
+/* hide tag row from tag plugin */
+div.tags {
+  display: none;
+}