Peter M. Groen / knowledgetree

Commit 893cf3417fe44a42e55c7fb47a0d0a1f762a600c

Authored by kevin_fourie
1 parent 15f71d9a

Merged in from STABLE trunk. 

KTC-212
"The pdf-Adobe icon does not appear in IE (6 & 7)"
Fixed. The href was missing a closing >

KTC-582
"UI defect on I.E 7 Windows XP and RedHat Linux"
Fixed. Increased the bottom padding on the info/error message.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9412 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
plugins/ktstandard/PDFGeneratorAction.php
  View file @893cf34
... ... @@ -72,12 +72,12 @@ class PDFGeneratorAction extends KTDocumentAction {
72 72 // make sure that the selected document is of an acceptable extension
73 73 foreach($this->aAcceptedMimeTypes as $acceptType){
74 74 if($acceptType == $sDocType){
75   - // built server path
76   - global $default;
77   - $sHostPath = "http" . ($default->sslEnabled ? "s" : "") . "://".$_SERVER['HTTP_HOST']."/".$GLOBALS['KTRootUrl']."/";
  75 + // build server path
  76 + $sHostPath = KTUtil::kt_url();
78 77 // create image
79   - $icon = "<img src='".$sHostPath."resources/mimetypes/pdf.gif' alt='PDF' border=0/>";
80   - return _kt('Generate PDF') . "&nbsp;<a href=\"" . KTUtil::ktLink( 'action.php', 'ktstandard.pdf.generate', array( "fDocumentId" => $this->oDocument->getId(), "action" => "pdfdownload") ) . "\" $icon</a>";
  78 + $icon = "<img src='{$sHostPath}/resources/mimetypes/pdf.gif' alt='PDF' border=0 />";
  79 + $link = KTUtil::ktLink('action.php', 'ktstandard.pdf.generate', array( 'fDocumentId' => $this->oDocument->getId(), 'action' => 'pdfdownload'));
  80 + return _kt('Generate PDF') . "&nbsp;<a href=\"{$link}\">{$icon}</a>";
81 81 }
82 82 }
83 83 }
... ...
resources/css/kt-framing.css
  View file @893cf34
... ... @@ -1033,6 +1033,7 @@ a.main_nav_item {
1033 1033 background: #ffdd80;
1034 1034 padding-left: 10px;
1035 1035 margin-top: 20px;
  1036 + padding-bottom: 8px;
1036 1037 }
1037 1038  
1038 1039 .ktError .err_item {
... ... @@ -1052,6 +1053,7 @@ a.main_nav_item {
1052 1053 background: #DEDEDE;
1053 1054 padding-left: 10px;
1054 1055 margin-top: 20px;
  1056 + padding-bottom: 8px;
1055 1057 }
1056 1058  
1057 1059 .ktInfo .info_item {
... ...