From f4fee8311821c8631846d944e658cf9ad3f21351 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 21 Feb 2019 14:51:38 +0000
Subject: - X-Y für Logo Anschreiben defniierbar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7306 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_coverletter/coverletter_pdf.phtml | 7 ++++++-
 views/mods/mod_coverletter/settings_edit.phtml   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_coverletter/coverletter_pdf.phtml b/views/mods/mod_coverletter/coverletter_pdf.phtml
index 71a39a7..a7e9040 100644
--- a/views/mods/mod_coverletter/coverletter_pdf.phtml
+++ b/views/mods/mod_coverletter/coverletter_pdf.phtml
@@ -46,14 +46,19 @@
 				if (wpsg_isSizedString($transparency) && $transparency !== "100") $alpha = "0.$transparency";
 				if (wpsg_isSizedString($transparency) && $transparency === "100") $alpha = $transparency;
 
+				/*
 				$logo_pos = $shop->get_option('wpsg_mod_coverletter_logo_position');
 
 				if(isset($logo_pos) && $logo_pos === "left") { $abscissa = 0; }
 				if(isset($logo_pos) && $logo_pos === "center") { $abscissa = 105 - ($wPix / 2); }
 				if(isset($logo_pos) && $logo_pos === "right") { $abscissa = 210 - $wPix; }
+				*/
+				
+				$logox = intval($shop->get_option('wpsg_mod_coverletter_logo_x'));
+				$logoy = intval($shop->get_option('wpsg_mod_coverletter_logo_y'));
 
 				$pdf->SetAlpha($alpha);
-				$pdf->image($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_logo.jpg", $abscissa, 0, $wPix, $hPix);
+				$pdf->image($shop->callMod('wpsg_mod_coverletter', 'getFilePath', array(''))."wpsg_coverletter_logo.jpg", $logox, $logoy, $wPix, $hPix);
 				$pdf->SetAlpha(1);
 
 			}
diff --git a/views/mods/mod_coverletter/settings_edit.phtml b/views/mods/mod_coverletter/settings_edit.phtml
index 9ce9126..f593b2f 100644
--- a/views/mods/mod_coverletter/settings_edit.phtml
+++ b/views/mods/mod_coverletter/settings_edit.phtml
@@ -58,8 +58,8 @@
 					<div class="row"><br />
                         <div class="col-md-12">
         				    <div class="position">
-                            	<input type="text" style="width:45%; float:left; margin-right:10px;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_x" name="text[<?php echo $f; ?>][x]" placeholder="X-Position" value="" />
-                                <input type="text" style="width:45%;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_y" name="text[<?php echo $f; ?>][x]" placeholder="Y-Position" value="" />
+                            	<input type="text" style="width:45%; float:left; margin-right:10px;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_x" name="wpsg_mod_coverletter_logo_x" placeholder="'.__('X-Position', 'wpsg').'" value="'.$this->get_option('wpsg_mod_coverletter_logo_x').'" />
+                                <input type="text" style="width:45%;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_y" name="wpsg_mod_coverletter_logo_y" placeholder="'.__('Y-Position', 'wpsg').'" value="'.$this->get_option('wpsg_mod_coverletter_logo_y').'" />
                             </div>
                         </div>
 						<div class="col-md-8 logo-transparency">
-- 
cgit v1.2.3