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

13 files changed, 303 insertions, 167 deletions

diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index c5d12f1..918444f 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -16,55 +16,44 @@
 			

 </div>

 

-<div class="wpsg_admin_content">

-	

-	<h3>

-		<?php echo __('E-Mail Konfiguration', 'wpsg'); ?>

-		<a title="<?php echo __('Hilfeseite zur E-Mail Konfiguration', 'wpsg'); ?>" class="wpsg_form_help_notip" href="http://wpshopgermany.maennchen1.de/?p=3284" target="_blank"></a>

-	</h3>

-			

-	<p><?php echo __('Hier können die Betreffs, Empfänger und BCC/CC der E-Mails konfiguriert werden.', 'wpsg')?></p>

-		

-	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>">

 

+<div class="wpsg_admin_content form-horizontal">

+	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=extended&noheader=1'); ?>">

+	

+		<?php echo wpsg_drawForm_AdminboxStart('Allgemeine Einstellungen', 'wpsg'); ?>

 		<?php echo wpsg_drawForm_Checkbox('wpsg_htmlmail', __('HTML Mails versenden', 'wpsg'), $this->get_option('wpsg_htmlmail')); ?>

+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 		

-		<br />

-	

-		<div class="wpsg_admin_box">		

-				  		 			

-			<?php echo wpsg_drawEMailConfig(

-					'global', 

-					__('Globale Vorgaben', 'wpsg'), 

-					__('Werden keine Angaben für die folgenden E-Mails gemacht, so gelten die globalen Angaben.', 'wpsg')); ?>

-					

-			<?php echo wpsg_drawEMailConfig(

-					'adminmail', 

-					__('Bestellbestätigung (Admin)', 'wpsg'), 

-					__('Diese Mail bekommt der Admin beim Eingang einer neuen Bestellung.', 'wpsg'), 

-					true); ?>

-				  		

-			<?php echo wpsg_drawEMailConfig(

-					'kundenmail', 

-					__('Bestellbestätigung (Kunde)', 'wpsg'), 

-					__('Diese Mail bekommt der Kunde nach Durchführung der Bestellung.', 'wpsg'),

-					false,

-					true); ?>

-			

-			<?php echo wpsg_drawEMailConfig(

-					'status', 

-					__('Statusänderung (Kunde)', 'wpsg'), 

-					__('Diese Mail bekommt der Kunde bei der Änderung des Bestellstatus.', 'wpsg')); ?>

-							

-			<?php $this->callMods('admin_emailconf'); ?>

-								

-		</div>

+		<?php echo wpsg_drawEMailConfig(

+			'global', 

+			__('Globale Vorgaben', 'wpsg'), 

+			__('Werden keine Angaben für die folgenden E-Mails gemacht, so gelten die globalen Angaben.', 'wpsg')); ?>

+		 

+		<?php echo wpsg_drawEMailConfig(

+			'adminmail', 

+			__('Bestellbestätigung (Admin)', 'wpsg'), 

+			__('Diese Mail bekommt der Admin beim Eingang einer neuen Bestellung.', 'wpsg'), 

+			true); ?>

+			  		

+		<?php echo wpsg_drawEMailConfig(

+			'kundenmail', 

+			__('Bestellbestätigung (Kunde)', 'wpsg'), 

+			__('Diese Mail bekommt der Kunde nach Durchführung der Bestellung.', 'wpsg'),

+			false,

+			true); ?>

 		

+		<?php echo wpsg_drawEMailConfig(

+			'status', 

+			__('Statusänderung (Kunde)', 'wpsg'), 

+			__('Diese Mail bekommt der Kunde bei der Änderung des Bestellstatus.', 'wpsg')); ?>

+						

+		<?php $this->callMods('admin_emailconf'); ?>

+

 		<div class="wpsg_hinweis"><?php echo __('Klicken Sie auf die jeweilige Mail um die Einstellungen angezeigt zu bekommen bzw. zu ändern.', 'wpsg'); ?></div>

-		

-		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 				

-	</form>	

+		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

+		

+	</form>

 </div>

 

 <script type="text/javascript">/* <![CDATA[ */

@@ -77,7 +66,7 @@
 

 		var wpsg_mail_open = Array();

 		

-		jQuery('.wpsg_admin_box .wpsg_mail_content:visible').each(function() {

+		jQuery('.wpsg_email_box .panel-body:visible').each(function() {

 

 			wpsg_mail_open.push(jQuery(this).prev().attr("id"));

 			

@@ -89,24 +78,13 @@
 

 	jQuery(document).ready(function() {

 

-		jQuery('.wpsg_admin_box .wpsg_mail_head').bind('click', function() {

-

-			jQuery(this).next().toggle();

-

-			if (!jQuery(this).next().is(":visible"))

-			{				

-				jQuery(this).css('border-bottom', '1px solid #AAAAAA');				

-			}

-			else

-			{				

-				jQuery(this).css('border-bottom', '0px');				

-			}

-

+		jQuery('.wpsg_email_box .panel-heading').bind('click', function() {

+ 

+			jQuery(this).next().toggle(); 

+			

 			wpsg_mail_save_cookie();

 			

-		} );

-

-		jQuery('.wpsg_admin_box .wpsg_mail_head').disableSelection();

+		} ).disableSelection().next().hide();

 

 		if (jQuery.cookie('wpsg_mail') != null)

 		{

diff --git a/views/admin/form/emailconf.phtml b/views/admin/form/emailconf.phtml
new file mode 100644
index 0000000..9ec6b63
--- /dev/null
+++ b/views/admin/form/emailconf.phtml
@@ -0,0 +1,52 @@
+

+<?php echo wpsg_drawForm_AdminboxStart($this->view['field_title'], 'wpsg_email_box'); ?>

+

+	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_betreff', __('Betreff', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_betreff')); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_absender', __('Absender', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_absender')); ?>

+

+	<?php if ($this->view['field_to'] === true) { ?>

+	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_empfaenger', __('Empfänger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_empfaenger')); ?>

+	<?php } ?>

+	

+	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_cc', __('CC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_cc')); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_bcc', __('BCC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_bcc')); ?>	

+	

+	<?php if ($this->view['field_attachment'] === true) { ?>

+		

+		<?php echo wpsg_drawForm_Upload('wpsg_'.$this->view['field_key'].'_attachfile', __('Mailanhang', 'wpsg'), '', '43', '100000', ''); ?>

+		<br />

+		<div class="wpsg_hinweis">

+			<strong><?php echo __('Aktueller Anhang', 'wpsg') ?>: </strong><?php echo ((wpsg_isSizedString($this->get_option('wpsg_'.$this->view['field_key'].'_attachfile')))?$this->get_option('wpsg_'.$this->view['field_key'].'_attachfile'):__('keiner', 'wpsg')); ?>

+			<?php echo ((wpsg_isSizedString($this->get_option('wpsg_kundenmail_attachfile')))?'<a class="wpsg_icon wpsg_icon_right wpsg_icon_remove" titel="'.__('Datei entfernen', 'wpsg').'" href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&amp;subaction='.$_REQUEST['subaction'].'&amp;cmd=del_attach_file"></a>':''); ?>

+		</div>

+		<br />

+		

+	<?php } ?>	

+	

+	<?php 

+	

+	// RTE

+	ob_start();

+	wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');

+	$rte_content = ob_get_contents();

+	ob_end_clean();

+

+	?>

+	

+	<div class="wpsg_form_field">

+		<div class="wpsg_form_left"><label><?php echo __('Text unter der E-Mail', 'wpsg'); ?></label></div>

+		<div class="wpsg_form_right"></div><div class="wpsg_clear"></div>

+	</div>

+

+	<?php echo $rte_content; ?>

+

+	<?php if (wpsg_isSizedString($notice)) { ?>

+

+	<br />

+	<div class="wpsg_hinweis"><?php echo $notice; ?></div>

+

+	<?php } ?>

+	

+	<br />

+		

+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml
index 4cedc72..cde674a 100644
--- a/views/admin/form/text.phtml
+++ b/views/admin/form/text.phtml
@@ -4,7 +4,7 @@
 	

 	<div class="col-sm-6 <?php echo wpsg_getStr($this->view['field_config']['class_content_wrap']); ?>">

 		<div class="wpsg_field_wrap">

-			<p class="form-control-static"><?php echo $this->view['field_value']; ?></p>

+			<p class="form-control-static" style="padding-left:0px;"><?php echo $this->view['field_value']; ?></p>

 				

 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

 				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

diff --git a/views/admin/form/upload.phtml b/views/admin/form/upload.phtml
new file mode 100644
index 0000000..dd0591b
--- /dev/null
+++ b/views/admin/form/upload.phtml
@@ -0,0 +1,33 @@
+<div class="form-group form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">

+

+	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>

+	

+	<div class="col-sm-6">

+	

+		<div class="wpsg_field_wrap">

+			<input 

+				type="file"

+				size="<?php echo $this->view['field_size']; ?>"

+				maxLength="<?php echo $this->view['field_maxLength']; ?>"

+				<?php if (wpsg_isSizedString($this->view['field_config']['accept'])) { ?>

+				accept="<?php echo $this->view['field_config']['accept']; ?>"

+				<?php } ?> 

+				class="form-control input-sm" 

+				name="<?php echo $this->view['field_name']; ?>" 

+				value="<?php echo wpsg_hspc($this->view['field_value']); ?>" 

+				id="<?php echo $this->view['field_id']; ?>"

+				placeholder="<?php echo wpsg_getStr($this->view['field_config']['placeholder']); ?>" 

+				<?php if (wpsg_isTrue($this->view['field_config']['readonly'])) { ?>

+				readonly="readonly"

+				<?php } ?>

+				/>

+			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+			<?php } ?>

+		</div>

+				

+	</div>

+	

+	<div class="clearfix wpsg_clear"></div>

+	

+</div>

diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml
index 9ca7023..50e58e5 100644
--- a/views/admin/includes.phtml
+++ b/views/admin/includes.phtml
@@ -16,19 +16,21 @@
 			

 </div>

 

-<div style="padding:0px; margin:0px; float:left;">		

-	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>&amp;noheader=1">

+<div class="wpsg_admin_content form-horizontal">

+	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=includes&noheader=1'; ?>">

 		

-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_css', __('Shop CSS styles nicht einbinden', 'wpsg'), $this->get_option('wpsg_load_css'), array('help' => 'wpsg_load_css')); ?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_jquery', __('JQuery einbinden', 'wpsg'), $this->get_option('wpsg_load_jquery'), array('help' => 'wpsg_load_jquery')); ?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_js', __('Thickbox einbinden (JavaScript)', 'wpsg'), $this->get_option('wpsg_load_thickbox_js'), array('help' => 'wpsg_load_thickbox')); ?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_css', __('Thickbox einbinden (Styles)', 'wpsg'), $this->get_option('wpsg_load_thickbox_css'), array('help' => 'wpsg_load_thickbox')); ?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_js', __('Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_js'), array('help' => 'wpsg_load_validierung')); ?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_css', __('CSS der Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_css'), array('help' => 'wpsg_load_validierung')); ?>

-		

-		<?php $this->callMods('admin_includes'); ?>

-		

-		<input type="hidden" name="subaction" value="includes" />

+		<?php echo wpsg_drawForm_AdminboxStart(__('Bibliotheken/Includes', 'wpsg')); ?>

+			

+			<?php echo wpsg_drawForm_Checkbox('wpsg_load_css', __('Shop CSS styles nicht einbinden', 'wpsg'), $this->get_option('wpsg_load_css'), array('help' => 'wpsg_load_css')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_load_jquery', __('JQuery einbinden', 'wpsg'), $this->get_option('wpsg_load_jquery'), array('help' => 'wpsg_load_jquery')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_js', __('Thickbox einbinden (JavaScript)', 'wpsg'), $this->get_option('wpsg_load_thickbox_js'), array('help' => 'wpsg_load_thickbox')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_css', __('Thickbox einbinden (Styles)', 'wpsg'), $this->get_option('wpsg_load_thickbox_css'), array('help' => 'wpsg_load_thickbox')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_js', __('Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_js'), array('help' => 'wpsg_load_validierung')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_css', __('CSS der Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_css'), array('help' => 'wpsg_load_validierung')); ?>

+			

+			<?php $this->callMods('admin_includes'); ?>

+	

+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 			

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 		

diff --git a/views/admin/kalkulation.phtml b/views/admin/kalkulation.phtml
index a6019b3..fc2e5e1 100644
--- a/views/admin/kalkulation.phtml
+++ b/views/admin/kalkulation.phtml
@@ -24,12 +24,7 @@
           		<h3 class="panel-title"><?php echo __('Preiskalkulation', 'wpsg'); ?></h3>

         	</div>

   			<div class="panel-body">

-	

-				<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptyshipping', __('Versandkosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?>

-				<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptypayment', __('Zahlungskosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?>

-	

-				<?php echo wpsg_drawForm_Checkbox('wpsg_kleinunternehmer', __('Kleinunternehmerregelung', 'wpsg'), $this->get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?>

-				

+						

 				<div class="wpsg_kleinunternehmer_layer wpsg_kleinunternehmer_layer_1">

 					<?php echo wpsg_drawForm_Textarea('wpsg_kleinunternehmer_text', __('Kleinunternehmerregelung Text', 'wpsg'), $this->get_option('wpsg_kleinunternehmer_text'), array()) ?>

 				</div>

@@ -40,8 +35,13 @@
 						WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg')

 					), $this->get_option('wpsg_preisangaben')); ?>				

 					<?php echo wpsg_drawForm_Select('wpsg_preisangaben_frontend', __('Preisangaben im Shop (Frontend)', 'wpsg'), array(WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg'), WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg')), $this->get_option('wpsg_preisangaben_frontend')); ?>					

-				</div>			

+				</div>

+				

+				<?php echo wpsg_drawForm_Checkbox('wpsg_kleinunternehmer', __('Kleinunternehmerregelung', 'wpsg'), $this->get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?>			

 								

+				<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptyshipping', __('Versandkosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?>

+				<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptypayment', __('Zahlungskosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?>	

+												

 			</div>

 		</div>

 				

diff --git a/views/admin/laender.phtml b/views/admin/laender.phtml
index f4de826..ee7fbb0 100644
--- a/views/admin/laender.phtml
+++ b/views/admin/laender.phtml
@@ -18,6 +18,66 @@
 

 <div class="wpsg_admin_content">

 

+	<?php echo wpsg_drawForm_AdminboxStart(__('Länderverwaltung', 'wpsg')); ?>

+	

+	<?php if (wpsg_isSizedArray($this->view['data'])) { ?>

+	<table class="table wpsg_table_country">

+	

+		<tr>

+			<th class="col_name"><?php echo __('Ländername', 'wpsg'); ?></th>

+			<th class="col_vz"><?php echo __('Versandzone', 'wpsg'); ?></th>

+			<th class="col_mwstsetting"><?php echo __('MwSt.', 'wpsg'); ?></th>

+			<th class="col_mwst"><?php echo __('MwSt. A', 'wpsg'); ?></th>

+			<th class="col_mwst"><?php echo __('MwSt. B', 'wpsg'); ?></th>

+			<th class="col_mwst"><?php echo __('MwSt. C', 'wpsg'); ?></th>

+			<th class="col_mwst"><?php echo __('MwSt. D', 'wpsg'); ?></th>

+			<th class="col_action"></th>

+		</tr>

+		

+		<?php foreach ($this->view['data'] as $l) { ?>

+		<tr id="<?php echo $l['id']; ?>">

+			<td class="col_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>

+			<td class="col_vz">

+				<?php if (wpsg_isSizedInt($l['vz']) && wpsg_isSizedString($this->view['vz'][$l['vz']])) { ?>

+				<?php echo wpsg_hspc($this->view['vz'][$l['vz']]); ?>

+				<?php } ?>

+			</td>

+			<td class="col_mwstsetting">

+				<?php if ($l['mwst'] == '2') { ?>

+				<?php echo __('keine MwSt. bei USt.IdNr.', 'wpsg'); ?>

+				<?php } else if ($l['mwst'] == '1') { ?>

+				<?php echo __('keine MwSt.', 'wpsg'); ?>

+				<?php } else { ?>

+				<?php echo __('mit MwSt.', 'wpsg'); ?>

+				<?php } ?>

+			</td>

+			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_a']) != NULL) { ?>

+				<?php echo wpsg_ff(wpsg_tf($l['mwst_a']), '%'); ?>

+			<?php } ?></td>

+			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_b']) != NULL) { ?>

+				<?php echo wpsg_ff(wpsg_tf($l['mwst_b']), '%'); ?>

+			<?php } ?></td>

+			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_c']) != NULL) { ?>

+				<?php echo wpsg_ff(wpsg_tf($l['mwst_c']), '%'); ?>

+			<?php } ?></td>

+			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_d']) != NULL) { ?>

+				<?php echo wpsg_ff(wpsg_tf($l['mwst_d']), '%'); ?>

+			<?php } ?></td>

+			<td class="col_action"></td>

+		</tr>

+		<?php } ?>

+	

+	</table>

+	<?php } else { ?>

+	<p><?php echo __('Noch keine Länder angelegt.', 'wpsg'); ?>

+	<?php } ?>

+	

+	<br /><br />

+	

+	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Versandzonenverwaltung', 'wpsg'); ?></a>

+	

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+

 	<div class="wpsg_admin_box">	

 		

 		<h3>

diff --git a/views/admin/seiten.phtml b/views/admin/seiten.phtml
index 405bf5f..7bb201f 100644
--- a/views/admin/seiten.phtml
+++ b/views/admin/seiten.phtml
@@ -16,11 +16,11 @@
 			

 </div>

 

-<div class="wpsg_admin_content">

-	<div class="wpsg_admin_box">		

-			

-		<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>&amp;noheader=1">

+<div class="wpsg_admin_content form-horizontal">

+	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=seiten&noheader=1'); ?>">	

 

+		<?php echo wpsg_drawForm_AdminboxStart(__('Seitenkonfiguration', 'wpsg')); ?>

+			

 			<?php echo wpsg_drawForm_Select('wpsg_page_basket', __('Warenkorbseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_basket')); ?>

 			<?php echo wpsg_drawForm_Select('wpsg_page_versand', __('Versandkosten', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_versand')); ?>

 			<?php echo wpsg_drawForm_Select('wpsg_page_agb', __('AGB', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_agb')); ?>

@@ -28,10 +28,12 @@
 			<?php echo wpsg_drawForm_Select('wpsg_page_widerrufsbelehrung', __('Widerrufsbelehrung', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_widerrufsbelehrung')); ?>			

 			<?php echo wpsg_drawForm_Input('wpsg_page_onlinedisputeresolution', __('Online Streitbeilegung', 'wpsg'), $this->get_option('wpsg_page_onlinedisputeresolution')); ?>

 			<?php echo wpsg_drawForm_Select('wpsg_page_impressum', __('Impressum', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_impressum')); ?>

-				

-			<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 			

-		</form>

-				

-	</div>

+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+			

+		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

+			

+		

+			

+	</form>	

 </div>
\ No newline at end of file
diff --git a/views/admin/versandzonen.phtml b/views/admin/versandzonen.phtml
index edd1d1b..fb73e8e 100644
--- a/views/admin/versandzonen.phtml
+++ b/views/admin/versandzonen.phtml
@@ -5,7 +5,32 @@
 	 */

 

 ?>

-<script type="text/javascript">

+

+<div class="wpsg_admin_submenu">

+	

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

+		<?php } ?>

+	</div> 

+			

+</div>

+

+<div class="wpsg_admin_content form-horizontal">

+	

+	<?php echo wpsg_drawForm_AdminboxStart(__('Versandzonen', 'wpsg')); ?>

+	

+		<br />

+		<span id="wpsg_vz_list"><?php $this->view['adminController']->vz_listAction(); ?></span>

+	

+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Länderverwaltung', 'wpsg'); ?></a>

+	

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+	

+</div>

+

+<script type="text/javascript">/* <![CDATA[ */

 

 	/**

 	 * Wird aufgerufen um einen neuen Satz hinzuzufügen und die Liste neu zu lasen.

@@ -93,34 +118,4 @@
 		

 	} // function wpsg_loadStandard()

 	

-</script>

-

-<div class="wpsg_admin_submenu">

-	

-	<div class="list-group">

-		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

-		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

-		<?php } ?>

-	</div> 

-			

-</div>

-

-<div class="wpsg_admin_content">

-	

-	<div class="wpsg_admin_box">		

-			  		

-		<div class="head">

-			<div class="title">

-				<div class="fulltab">

-					<?php echo __('Versandzonen', 'wpsg'); ?>

-					<a title="<?php echo __('Neue Versandzone anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addVZ();"></a>

-				</div>

-			</div>

-		</div>

-		<div class="content">

-			<span id="wpsg_vz_list"><?php $this->view['adminController']->vz_listAction(); ?></span>

-		</div>

-				

-	</div>

-</div>
\ No newline at end of file
+/* ]]> */</script>
\ No newline at end of file
diff --git a/views/admin/versandzonen_list.phtml b/views/admin/versandzonen_list.phtml
index d76e497..16bb1e0 100644
--- a/views/admin/versandzonen_list.phtml
+++ b/views/admin/versandzonen_list.phtml
@@ -8,7 +8,7 @@
 <?php if (!is_array($this->view['data']) || sizeof($this->view['data']) <= 0) { ?>

 <?php echo __('Bisher keine Versandzonen hinterlegt.', 'wpsg'); ?>

 <?php } else { ?>

-<table class="wpsg_admin_vz_list wpsg_admin_table">

+<table class="table wpsg_table_vz">

 	<tr>

 		<th class="col_name"><?php echo __('Bezeichnung', 'wpsg'); ?></th>

 		<th class="col_innereu"><?php echo __('Inner- gemeinschaftlich', 'wpsg'); ?></th>

@@ -19,19 +19,18 @@
 		<td class="wpsg_editable col_name">

 			<span  id="vz_<?php echo $vz['id']; ?>_name" ><?php echo wpsg_hspc($vz['name']); ?></span> 

 			<br />

-			<?php if (!empty($vz['param'])) { $arPLZ = unserialize($vz['param']); } ?>

-			<div id="vz_<?php echo $vz['id']; ?>_plz" style="display:none">

-				<textarea style="float:left; width:100%;"><?php echo wpsg_hspc($vz['param']); ?></textarea>

-				<input style="width:75px;" class="" type="submit" name="wpsg_mod_vz_submitsave" value="<?php echo __('Speichern', 'wpsg'); ?>" onclick="return wpsg_savePLZ(<?php echo $vz['id']; ?>);" />

+			<div id="vz_<?php echo $vz['id']; ?>_plz" style="display:none" class="wpsg_plz_div">

+				<textarea><?php echo wpsg_hspc($vz['param']); ?></textarea>

+				<input type="submit" class="button" name="wpsg_mod_vz_submitsave" value="<?php echo __('Speichern', 'wpsg'); ?>" onclick="return wpsg_savePLZ(<?php echo $vz['id']; ?>);" />

 			</div>

 		</td>

 		<td class="col_innereu">		 

 			<input class="wpsg_innereu" <?php echo (($vz['innereu'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" name="innereu_<?php echo $vz['id']; ?>" id="innereu_<?php echo $vz['id']; ?>" />								

 		</td>

 		<td class="col_aktion">

-			

-			<a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Versandzone löschen', 'wpsg'); ?>" onclick="return wpsg_removeVZ(<?php echo $vz['id']; ?>);"></a>			

-			<span><a class="wpsg_icon wpsg_icon_right wpsg_icon_plzedit" href="#" title="<?php echo __('Versandzonen PLZ bearbeiten', 'wpsg'); ?>" onclick="return wpsg_editPLZ(<?php echo $vz['id']; ?>);"></a></span>

+						

+			<a class="wpsg_icon_plzedit" href="#" title="<?php echo __('Versandzonen PLZ bearbeiten', 'wpsg'); ?>" onclick="return wpsg_editPLZ(<?php echo $vz['id']; ?>);">[ PLZ ]</a>

+			<a class="glyphicon glyphicon-trash" href="#" title="<?php echo __('Versandzone löschen', 'wpsg'); ?>" onclick="return wpsg_removeVZ(<?php echo $vz['id']; ?>);"></a>

 			

 			<script type="text/javascript">/* <![CDATA[ */

 

diff --git a/views/admin/widerrufsbelehrung.phtml b/views/admin/widerrufsbelehrung.phtml
index 016a917..3f1e805 100644
--- a/views/admin/widerrufsbelehrung.phtml
+++ b/views/admin/widerrufsbelehrung.phtml
@@ -16,41 +16,34 @@
 			

 </div>

 

-<div style="padding:0px; margin:0px; float:left;">		

+<div class="wpsg_admin_content form-horizontal">

 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>&amp;noheader=1">

-  

-  		<div class="wpsg_widerrufstext">

-			

+	

+		<?php echo wpsg_drawForm_AdminboxStart(__('Widerruf', 'wpsg')); ?>

+			 

 			<?php echo wpsg_drawForm_Textarea('wpsg_ps_mailwiderruf', __('Widerrufsbelehrung', 'wpsg'), $this->get_option('wpsg_ps_mailwiderruf'), array(

 				'hint' => 'nohspc_'.__('Dieser Text wird in die Mail eingebunden, die der Kunde als Bestellbestätigung erhält.', 'wpsg').'<br />'.__('Das Template für die Mail finden Sie unter: <b>views/mailtemplates/kundenmail.phtml</b> bzw. <b>views/mailtemplates/html/kundenmail.phtml</b>.', 'wpsg')

-			)); ?>

-							

+			)); ?>							

 			<?php echo wpsg_drawForm_Upload('wpsg_widerrufsformular', __('Widerrufsformular', 'wpsg')); ?>

-						

-			<div class="wpsg_form_field">

-				<div class="wpsg_form_left">&nbsp;</div>

-				<div class="wpsg_form_right">

-	

-					<?php if (wpsg_isSizedString($this->view['revocationform'])) { ?>

-					

-						<a target="_blank" href="<?php echo WPSG_URL_UPLOADS.'wpsg_revocation/'.$this->get_option('wpsg_revocationform'); ?>"><?php echo $this->view['revocationform']; ?></a>

-						<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie das Widerrufsformular löschen möchten?', 'wpsg'); ?>')) return false;" style="float:right;" href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung&noheader=1&do=removeWiderrufsformular'; ?>"><?php echo __('Widerrufsformular löschen', 'wpsg'); ?></a>

-					

-					<?php } else { ?>

-					

-						<p><?php echo __('Bisher wurde kein Widerrufsformular hinterlegt.', 'wpsg'); ?></p>

-					

-					<?php } ?>

-					

-					<div style="clear:both;"><br />

-					

-					<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung&noheader=1&do=generateWiderrufsformular'; ?>" class="button"><?php echo __('Standardformular aus Shopinfo erstellen', 'wpsg'); ?></a>

-					<br /><br />

-					

-				</div>

-				<div class="wpsg_clear"></div>

-			</div> 

+

+			<?php echo wpsg_drawForm_TextStart(); ?>

+			<?php if (wpsg_isSizedString($this->view['revocationform'])) { ?>

 			

+				<a target="_blank" href="<?php echo WPSG_URL_UPLOADS.'wpsg_revocation/'.$this->get_option('wpsg_revocationform'); ?>"><?php echo $this->view['revocationform']; ?></a>

+				<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie das Widerrufsformular löschen möchten?', 'wpsg'); ?>')) return false;" style="float:right;" href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung&noheader=1&do=removeWiderrufsformular'; ?>"><?php echo __('Widerrufsformular löschen', 'wpsg'); ?></a>

+			

+			<?php } else { ?>

+			

+				<p><?php echo __('Bisher wurde kein Widerrufsformular hinterlegt.', 'wpsg'); ?></p>

+			

+			<?php } ?>

+			

+			<br /><br />

+			<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung&noheader=1&do=generateWiderrufsformular'; ?>" class="button"><?php echo __('Standardformular aus Shopinfo erstellen', 'wpsg'); ?></a>

+			<br /><br />

+			

+			<?php echo wpsg_drawForm_TextEnd(); ?>

+		

 			<?php echo wpsg_drawForm_Checkbox('wpsg_widerrufsformular_kundenmail', __('Anhang an Bestellbestätigung', 'wpsg'), $this->get_option('wpsg_widerrufsformular_kundenmail')); ?>

 			

 			<?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>

@@ -60,10 +53,10 @@
 			<?php if ($this->hasMod('wpsg_mod_auftragsbestaetigung')) { ?>

 			<?php echo wpsg_drawForm_Checkbox('wpsg_widerrufsformular_orderconfirm', __('Anhang an Auftragsbestätigung', 'wpsg'), $this->get_option('wpsg_widerrufsformular_orderconfirm')); ?>

 			<?php } ?>

-			 

-		</div>

-			

+					 

+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

-			

+

 	</form>

-</div>
\ No newline at end of file
+</div>

diff --git a/views/css/admin.css b/views/css/admin.css
index 99600af..a96130d 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -39,6 +39,10 @@
 /* Kundenverwaltung -> Kundendaten */

 #wpsg-bs .wpsg_customerfield .tab-content { position:relative; padding-top:1.5rem; }

 #wpsg-bs .wpsg_customervar_row2 td { border-top:0px; } 

+

+/* Länderverwaltung */

+.wpsg_table_country .col_mwst { width:75px; }

+.wpsg_table_country .col_action { width:35px; }

  

 /* Tabelle der Berechtigungen */

 .wpsg_access_table .wpsg_col_cap { text-align:center; }

@@ -103,6 +107,11 @@
 .wpsg_modul_onlyactive_glyphicon { position:absolute !important; right:5px; top:7px !important; color:#3c763d; }

 .wpsg_modul_search_wrap input[type="checkbox"] { right:25px; top:3px; position:absolute; }

 

+/* Verwaltung Versandzonen */

+.wpsg_table_vz .col_aktion { text-align:right; }

+.wpsg_table_vz .wpsg_icon_plzedit { margin-right:5px; }

+.wpsg_table_vz .wpsg_plz_div textarea { width:100%; padding:5px; margin-top:5px; margin-bottom:5px; }

+

 /* Formularanpassungen */

 .form-checkbox label { font-size:12px; line-height:200%; }

 

diff --git a/views/produkt/addedit_texte.phtml b/views/produkt/addedit_texte.phtml
index 4227c0b..eb58c28 100644
--- a/views/produkt/addedit_texte.phtml
+++ b/views/produkt/addedit_texte.phtml
@@ -6,7 +6,7 @@
 

 ?>

 

-<?php echo wpsg_drawForm_AdminboxStart(__('Beschreibung', 'wpsg')); ?>

+<?php echo wpsg_drawForm_AdminboxStart(__('Kurztext', 'wpsg')); ?>

 <?php 

 								

 	function wpsg_ShowTinyMCE() 

@@ -32,12 +32,25 @@
 		

 	}

 	

-	// Damit die qTranslate Interne Editor Übersetzung nicht aufgerufen wird

+	//// Damit die qTranslate Interne Editor Übersetzung nicht aufgerufen wird

 	remove_filter('the_editor', 'qtrans_modifyRichEditor');

 	

 	add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE');

-	add_filter('admin_head','wpsg_ShowTinyMCE');

+	add_filter('admin_head', 'wpsg_ShowTinyMCE');

 	wp_editor(@$this->view['data']['beschreibung'], 'beschreibung');

 	

 ?>

+<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+

+<?php echo wpsg_drawForm_AdminboxStart(__('Langtext', 'wpsg')); ?>

+<?php 

+						 	

+	// Damit die qTranslate Interne Editor Übersetzung nicht aufgerufen wird

+	//remove_filter('the_editor', 'qtrans_modifyRichEditor');

+	

+	add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE');

+	add_filter('admin_head', 'wpsg_ShowTinyMCE');

+	wp_editor(@$this->view['data']['longdescription'], 'longdescription');

+	

+?>

 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file