- Anpassungen der Positionierungsbuttons

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7103 0d5edaf7-2b12-4e95-93f4-047927463d4b

5 files changed, 26 insertions, 12 deletions

diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index fb2c857..3e193ed 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -38,8 +38,6 @@
 					$this->get_option('wpsg_email_logo_activated')

 				); ?>

 

-				<br>

-

 				<?php echo wpsg_drawForm_Checkbox(

 					'wpsg_email_logo_watermark',

 					__("E-Maillogo als Wasserzeichen anzeigen"),

@@ -47,6 +45,8 @@
 				); ?>

 			<?php } ?>

 

+			<br />

+			

 			<div class="form-group">

 				<div class="col-sm-6 control-label control-label-email-conf">

 					<label><?php echo __("E-Maillogo (JPG)"); ?></label>

@@ -67,7 +67,9 @@
 				<?php } ?>

 

 			</div> <!-- .form-group -->

-

+			

+			<br />

+			

 			<?php if(file_exists($logoPath)) { ?>

 

 				<div class="form-group col-logo-alignment">

@@ -83,7 +85,9 @@
 						<input type="radio" name="wpsg_email_logo_alignment" value="right" <?php if($logoAlignment === "right" || $standardAlignment):?>checked<?php endif;?>> <span>&#xf038 <?php echo __("Rechtsbündig"); ?></span>

 					</div>

 				</div>

-

+				

+				<br />

+				

 				<?php $logoTransparency = $this->get_option('wpsg_email_logo_transparency'); ?>

 				<?php if(!wpsg_isSized($logoTransparency)) $logoTransparency = "100%"; ?>

 				<?php echo wpsg_drawForm_Input(

diff --git a/views/css/admin.css b/views/css/admin.css
index fbce4f8..e50446e 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -361,7 +361,9 @@ table.wpsgitrecht_table { width:100%; }
 .align-buttons input, .align-buttons input:hover { font-family: FontAwesome !important; cursor: pointer; outline: 0; border: 1px solid #ddd; background: #f9f9f9; color: #666; padding: 3px 7px; width: 30%; }

 .align-buttons-active { background: #f1f1f1 !important; border-color: #ccc !important; box-shadow: 0 1px 0 #ccc; color: #555 !important; }

 .logo-transparency * { text-align:center; }

+.logo-transparency { margin:20px 0; }

 .logo-transparency input { width: 30%; margin-left: -20px; margin-right: 5px; }

+.align-buttons { margin:20px 0; }

 

 #rechnungen_order_backend label,

 #wpsg_rechnungen_email,

diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml
index b5dbda6..426cfd2 100644
--- a/views/mods/mod_deliverynote/settings_edit.phtml
+++ b/views/mods/mod_deliverynote/settings_edit.phtml
@@ -17,6 +17,8 @@
 

 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_adressrow', __('Adresszeile', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_adressrow'), array('help' => 'wpsg_mod_deliverynote_adressrow')); ?>

 

+			<hr>

+			

 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<div style="position:relative;">

 				<?php if ($this->view['wpsg_mod_deliverynote']['bp'] === false) { ?>

@@ -35,6 +37,8 @@
 			</div>

 			<?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?>

 

+			<hr>

+			

 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<div style="position:relative;">

 				<?php if ($this->view['wpsg_mod_deliverynote']['logo'] === false) { ?>

@@ -75,7 +79,8 @@
 					</div>';

 					echo __($strSuffix);

 				} ?>

-

+						

+					

 				<button class="button wpsg_deliverynote_preview" style="float:right; margin-right:10px;" name="wpsg_deliverynote_preview" type="button">

 					<?php echo __("Vorschau", "wpsg"); ?>

 				</button>

@@ -83,7 +88,7 @@
 			</div>

 			<?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>

 

-			<br />

+			<hr> <br />

 

 			<table class="table table-body-striped wpsg_mod_deliverynote_fieldtable">

 				<thead>

diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml
index fb5b638..16b30b9 100644
--- a/views/mods/mod_rechnungen/settings_edit.phtml
+++ b/views/mods/mod_rechnungen/settings_edit.phtml
@@ -16,10 +16,9 @@
 		<div id="tab1" role="tabpanel" class="tab-pane active" >

 

 			<?php echo wpsg_drawForm_Input('wpsg_rechnungen_adresszeile', __('Adresszeile', 'wpsg'), $this->get_option('wpsg_rechnungen_adresszeile')); ?>

-			<!--

-			<div class="wpsg_hinweis"><?php echo __('Diese Zeile wird klein oberhalb der Kundenadresse platziert', 'wpsg'); ?></div>

-			<br />

--->

+			

+			<hr>

+

 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<div style="position:relative;">

 				<?php if ($this->view['bp'] === false) { ?>

@@ -37,7 +36,9 @@
 				} ?>

 			</div>

 			<?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>

-

+				

+			<hr>	

+				

 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<div style="position:relative;">

 				<?php if ($this->view['logo'] === false) { ?>

@@ -91,7 +92,9 @@
 			<!--

 			<div class="wpsg_hinweis"><?php echo __('Das Briefpapier wird hinter die gesamte Seite gelegt, das Logo wird standardmäßig rechts oben auf jeder Seite platziert. (96 dpi)', 'wpsg'); ?></div>

 			<br />

--->

+-->			

+			<hr> 

+			

 			<table class="table table-body-striped wpsg_mod_deliverynote_fieldtable">

 				<thead>

 				<tr>

diff --git a/views/mods/mod_su/gfx/logo_100x25.png b/views/mods/mod_su/gfx/logo_100x25.png
index 4fbb01f..fa898a1 100644
--- a/views/mods/mod_su/gfx/logo_100x25.png
+++ b/views/mods/mod_su/gfx/logo_100x25.png