From 893cf3417fe44a42e55c7fb47a0d0a1f762a600c Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 29 Sep 2008 13:30:09 +0000
Subject: [PATCH] Merged in from STABLE trunk.

---
 plugins/ktstandard/PDFGeneratorAction.php | 10 +++++-----
 resources/css/kt-framing.css              |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/ktstandard/PDFGeneratorAction.php b/plugins/ktstandard/PDFGeneratorAction.php
index f74ba6d..de7d3ff 100644
--- a/plugins/ktstandard/PDFGeneratorAction.php
+++ b/plugins/ktstandard/PDFGeneratorAction.php
@@ -72,12 +72,12 @@ class PDFGeneratorAction extends KTDocumentAction {
             // make sure that the selected document is of an acceptable extension
             foreach($this->aAcceptedMimeTypes as $acceptType){
                 if($acceptType == $sDocType){
-    	            // built server path
-                    global $default;
-    	            $sHostPath = "http" . ($default->sslEnabled ? "s" : "") . "://".$_SERVER['HTTP_HOST']."/".$GLOBALS['KTRootUrl']."/";
+    	            // build server path
+    	            $sHostPath = KTUtil::kt_url();
                     // create image
-                    $icon = "<img src='".$sHostPath."resources/mimetypes/pdf.gif' alt='PDF' border=0/>";
-                    return _kt('Generate PDF') . "&nbsp;<a href=\"" . KTUtil::ktLink( 'action.php', 'ktstandard.pdf.generate', array( "fDocumentId" => $this->oDocument->getId(), "action" => "pdfdownload") ) . "\" $icon</a>";
+                    $icon = "<img src='{$sHostPath}/resources/mimetypes/pdf.gif' alt='PDF' border=0 />";
+                    $link = KTUtil::ktLink('action.php', 'ktstandard.pdf.generate', array( 'fDocumentId' => $this->oDocument->getId(), 'action' => 'pdfdownload'));
+                    return _kt('Generate PDF') . "&nbsp;<a href=\"{$link}\">{$icon}</a>";
                 }
             }
         }
diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css
index 787bf15..3c9f6da 100644
--- a/resources/css/kt-framing.css
+++ b/resources/css/kt-framing.css
@@ -1033,6 +1033,7 @@ a.main_nav_item {
     background: #ffdd80;
     padding-left: 10px;
     margin-top: 20px;
+    padding-bottom: 8px;
 }
 
 .ktError .err_item {
@@ -1052,6 +1053,7 @@ a.main_nav_item {
     background: #DEDEDE;
     padding-left: 10px;
     margin-top: 20px;
+    padding-bottom: 8px;
 }
 
 .ktInfo .info_item {
--
libgit2 0.21.4