Index: /lib/wpsg_basket_widget.class.php
===================================================================
--- /lib/wpsg_basket_widget.class.php	(revision 5824)
+++ /lib/wpsg_basket_widget.class.php	(revision 5825)
@@ -10,5 +10,5 @@
 		var $id = "wpsg_basket_widget";
 		
-		function wpsg_basket_widget()
+		function __construct()
 		{
 					 
Index: /views/admin/form/select.phtml
===================================================================
--- /views/admin/form/select.phtml	(revision 5824)
+++ /views/admin/form/select.phtml	(revision 5825)
@@ -28,5 +28,5 @@
 
 				?>"
-				class="form-control input-sm" <?php echo $this->view['atts_select']; ?>>
+				class="form-control input-sm <?php echo wpsg_getStr($this->view['field_config']['field_class']); ?>" <?php echo $this->view['atts_select']; ?>>
 				
 				<?php 
Index: /views/admin/laender.phtml
===================================================================
--- /views/admin/laender.phtml	(revision 5824)
+++ /views/admin/laender.phtml	(revision 5825)
@@ -51,6 +51,6 @@
 
 	<a href="#" onclick="return wpsg_country_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Land anlegen.', 'wpsg'); ?></a><br />
-    <a href="#" onclick="return wpsg_country_import();"><span class="wpsg-glyphicon glyphicon glyphicon-import"></span><? echo __('StandardlÃ€nder importieren.', 'wpsg'); ?></a><br />
-     <a href="#" onclick="return wpsg_country_importEU();"><span class="wpsg-glyphicon glyphicon glyphicon-import"></span><? echo __('EU-LÃ€nder importieren.', 'wpsg'); ?></a><br />
+    <a href="#" onclick="return wpsg_country_import();"><span class="wpsg-glyphicon glyphicon glyphicon-import"></span><?php echo __('StandardlÃ€nder importieren.', 'wpsg'); ?></a><br />
+     <a href="#" onclick="return wpsg_country_importEU();"><span class="wpsg-glyphicon glyphicon glyphicon-import"></span><?php echo __('EU-LÃ€nder importieren.', 'wpsg'); ?></a><br />
 
     <br />
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 5824)
+++ /views/css/admin.css	(revision 5825)
@@ -229,2 +229,6 @@
 #beschreibung_ifr { height:500px; }
 
+/* Modul Downloadplus */
+.wpsg_mod_downloadplus_fieldtable { font-size:12px; }
+.wpsg_mod_downloadplus_fieldtable .col_x,
+.wpsg_mod_downloadplus_fieldtable .col_y { width:50px; }
Index: /views/mods/mod_discount/settings_edit.phtml
===================================================================
--- /views/mods/mod_discount/settings_edit.phtml	(revision 5824)
+++ /views/mods/mod_discount/settings_edit.phtml	(revision 5825)
@@ -68,5 +68,5 @@
 
                     <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg').' '.wpsg_ff(0, $this->get_option('wpsg_currency')); ?></div>
-                    <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><input type="text" name="value[0][rabatt]" value="<?php echo wpsg_ff($this->view['data'][0]['rabatt']); ?>" /></div>
+                    <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><input type="text" name="value[0][rabatt]" value="<?php echo wpsg_ff(@$this->view['data'][0]['rabatt']); ?>" /></div>
                     <div class="wpsg_clear"></div>
 
Index: /views/mods/mod_downloadplus/settings_edit.phtml
===================================================================
--- /views/mods/mod_downloadplus/settings_edit.phtml	(revision 5824)
+++ /views/mods/mod_downloadplus/settings_edit.phtml	(revision 5825)
@@ -6,212 +6,182 @@
 
 ?>
-<div class="wpsg_admin_box wpsg_mod_downloadplus" id="wpsg_tab">	
-	<div class="head">
-		<div class="title">
-			<div class="tab" id="tab1"><?php echo __('Einstellungen', 'wpsg'); ?></div>
-			<div class="tab" id="tab2"><?php echo __('Textfelder', 'wpsg'); ?></div>
-			<div class="tab" id="tab3"><?php echo __('Erweitert', 'wpsg'); ?></div>
-			<div class="tab tabright tabright-last" id="tab4"><?php echo __('Info / Hilfe', 'wpsg'); ?></div>
-			<div class="wpsg_clear"></div>
-		</div>
-	</div>
-	<div class="content">
-		
-		<div id="tabcontent1" class="tabcontent">		
-		
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_filename', __('Personalisierter Dateiname', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_filename'), array('help' => 'mod_pdfdownload_einstellungen_filename')); ?>
+
+<div>
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="active"><a href="#tab1" role="tab" data-toggle="tab"><?php echo __('Einstellungen', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab2" role="tab" data-toggle="tab"><?php echo __('Textfelder', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab3" role="tab" data-toggle="tab"><?php echo __('Erweitert', 'wpsg'); ?></a></li>
+        <li role="presentation" style="float:right;"><a href="#tab4" role="tab" data-toggle="tab"><?php echo __('Info / Hilfe', 'wpsg'); ?></a></li>
+    </ul>
+    <div class="tab-content">
+
+        <div role="tabpanel" class="tab-pane active" id="tab1">
+
+            <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_filename', __('Personalisierter Dateiname', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_filename'), array('help' => 'mod_pdfdownload_einstellungen_filename')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_indiv_mode', __('Individualisierung planen', 'wpsg'), array(0 => __('Manuell', 'wpsg'), 1 => __('Nach Zahlung', 'wpsg'), 2 => __('Nach Bestellung', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_indiv_mode'), array('help' => 'mod_pdfdownload_einstellungen_individualisierungsmodus')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_autosend', __('PDFs nach Individualisierung sofort senden', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_autosend'), array('help' => 'mod_pdfdownload_einstellungen_autosend')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_shipping', __('Versandart "Versand per Mail" aktiv', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_shipping'), array('help' => 'wpsg_mod_downloadplus_shipping')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_einsplusx', __(' Mehr als ein Produkt im Warenkorb zulassen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_einsplusx'), array('help' => 'wpsg_mod_downloadplus_einsplusx')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_accepted', __('GÃŒltigkeit von Links', 'wpsg'), array(0 => __('Unbegrenzt', 'wpsg'), 1 => __('Nach Downloads', 'wpsg'), 2 => __('Nach Tagen', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_accepted'), array('help' => 'mod_pdfdownload_einstellungen_accepted')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_days', __('GÃŒltigkeit in Tagen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_days'), array('help' => 'wpsg_mod_downloadplus_days')); ?> 
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_downloads', __('Anzahl an mÃ¶glichen Downloads', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_downloads'), array('help' => 'wpsg_mod_downloadplus_downloads')); ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_cleanraiddownloads', __('Abgelaufene Downloads bereinigen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_cleanraiddownloads'), array('help' => 'wpsg_mod_downloadplus_cleanraiddownloads')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_cleanolddownloads', __('Downloads nach X Tagen lÃ¶schen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_cleanolddownloads'), array('help' => 'wpsg_mod_downloadplus_cleanolddownloads')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_accepted', __('GÃŒltigkeit von Links', 'wpsg'), array(0 => __('Unbegrenzt', 'wpsg'), 1 => __('Nach Downloads', 'wpsg'), 2 => __('Nach Tagen', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_accepted'), array('field_class' => 'wpsg_change', 'help' => 'mod_pdfdownload_einstellungen_accepted')); ?>
+
+            <div class="wpsg_mod_downloadplus_accepted wpsg_mod_downloadplus_accepted_2">
+                <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_days', __('GÃŒltigkeit in Tagen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_days'), array('help' => 'wpsg_mod_downloadplus_days')); ?>
+            </div>
+
+            <div class="wpsg_mod_downloadplus_accepted wpsg_mod_downloadplus_accepted_1">
+			    <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_downloads', __('Anzahl an mÃ¶glichen Downloads', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_downloads'), array('help' => 'wpsg_mod_downloadplus_downloads')); ?>
+            </div>
+
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_cleanraiddownloads', __('Abgelaufene Downloads bereinigen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_cleanraiddownloads'), array('help' => 'wpsg_mod_downloadplus_cleanraiddownloads')); ?>
+            <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_cleanolddownloads', __('Downloads nach X Tagen lÃ¶schen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_cleanolddownloads'), array('help' => 'wpsg_mod_downloadplus_cleanolddownloads')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_pdfpath', __('Pfad fÃŒr die PDFs der Produkte', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_pdfpath'), array('hint' => __('Standard: uploads/wpsg_pdfprodukte/', 'wpsg'), 'help' => 'wpsg_mod_downloadplus_pdfpath')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_pdfindivpath', __('Pfad fÃŒr die Individualisierten PDFs', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_pdfindivpath'), array('hint' => __('Standard: uploads/wpsg_pdfprodukte_order/', 'wpsg'), 'help' => 'wpsg_mod_downloadplus_pdfindivpath')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_format', __('Auslieferungsformat', 'wpsg'), array(0 => __('Direkt', 'wpsg'), 1 => __('Gezippt (intern)', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_format'), array('help' => 'wpsg_mod_downloadplus_format')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_range', __('Anpassung', 'wpsg'), array(0 => __('Gesamtes Dokument', 'wpsg'), 1 => __('Bereich', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_range'), array ('help' => 'wpsg_mod_downloadplus_range')); ?>
-			<div class="wpsg_form_field" style="display:none;" id="wpsg_mod_downloadplus_rangefield">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Seitenbereich (Von/Bis)', 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right">
-					<input type="text" style="width:100px;" size="5" name="wpsg_mod_downloadplus_range_von" value="<?php echo $this->get_option('wpsg_mod_downloadplus_range_von'); ?>" />&nbsp;-&nbsp;
-					<input type="text" style="width:100px;" size="5" name="wpsg_mod_downloadplus_range_bis" value="<?php echo $this->get_option('wpsg_mod_downloadplus_range_bis'); ?>" />					
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_masterpass', __('Passwort (Um Schutz aufzuheben)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_masterpass'), array('help' => 'wpsg_mod_downloadplus_masterpass')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_range', __('Anpassung', 'wpsg'), array(0 => __('Gesamtes Dokument', 'wpsg'), 1 => __('Bereich', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_range'), array ('field_class' => 'wpsg_change', 'help' => 'wpsg_mod_downloadplus_range')); ?>
+
+            <div class="wpsg_mod_downloadplus_range wpsg_mod_downloadplus_range_1">
+                <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_range_von', __('Anpassung ab Seite', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_range_von'), array()); ?>
+                <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_range_bis', __('Anpassung bis Seite', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_range_bis'), array()); ?>
+            </div>
+
+            <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_masterpass', __('Passwort (Um Schutz aufzuheben)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_masterpass'), array('help' => 'wpsg_mod_downloadplus_masterpass')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_openpass', __('Passwort (Um Dokument Ã¶ffnen zu kÃ¶nnen)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_openpass'), array('help' => 'wpsg_mod_downloadplus_openpass')); ?>
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Dokumentenberechtigungen', 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right wpsg_mod_downloadplus_security">
-					<p>
-						<input type="hidden" value="0" name="wpsg_mod_downloadplus_securitysave" />
-						<label><input type="checkbox" value="1" name="wpsg_mod_downloadplus_securitysave" <?php echo (($this->get_option('wpsg_mod_downloadplus_securitysave') == '1')?'checked="checked"':''); ?> />&nbsp;<?php echo __('Speichern erlauben', 'wpsg'); ?></label><br />
-						
-						<input type="hidden" value="0" name="wpsg_mod_downloadplus_securityprint" />
-						<label><input type="checkbox" value="1" name="wpsg_mod_downloadplus_securityprint" <?php echo (($this->get_option('wpsg_mod_downloadplus_securityprint') == '1')?'checked="checked"':''); ?> />&nbsp;<?php echo __('Drucken erlauben', 'wpsg'); ?></label><br />
-						
-						<input type="hidden" value="0" name="wpsg_mod_downloadplus_securitymod" />
-						<label><input type="checkbox" value="1" name="wpsg_mod_downloadplus_securitymod" <?php echo (($this->get_option('wpsg_mod_downloadplus_securitymod') == '1')?'checked="checked"':''); ?> />&nbsp;<?php echo __('Modifizieren erlauben', 'wpsg'); ?></label><br />
-						
-						<input type="hidden" value="0" name="wpsg_mod_downloadplus_securitynote" />
-						<label><input type="checkbox" value="1" name="wpsg_mod_downloadplus_securitynote" <?php echo (($this->get_option('wpsg_mod_downloadplus_securitynote') == '1')?'checked="checked"':''); ?> />&nbsp;<?php echo __('Bemerkungen erlauben', 'wpsg'); ?></label><br />
-					</p>
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Mail fÃŒr Individualisierungsbericht', 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right">
-					<p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?></p>
-					<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>			
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Mail fÃŒr Downloads an Kunden', 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right">
-					<p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?></p>
-					<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Letzte AusfÃŒhrung des Crons', 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right">
-					<p><?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgefÃŒhrt', 'wpsg')); ?></p>
-					<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>
-			
-		</div>
-		
-		<div id="tabcontent2" class="tabcontent">
-			<table class="wpsg_mod_downloadplus_fieldtable">
-				<tr>
-					<th class="col_bezeichnung"></th>					
-					<th class="col_x"><?php echo __('X', 'wpsg'); ?></th>
-					<th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>
-					<th class="col_align"><?php echo __('Zentriert', 'wpsg'); ?></th>
-					<th class="col_bg"><?php echo __('Hintergrund', 'wpsg'); ?></th>
-					<th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>
-					<th class="col_alpha"><?php echo __('Opaque', 'wpsg'); ?></th>
-					<th class="col_angle"><?php echo __('Winkel', 'wpsg'); ?></th>
-					<th class="col_groesse"><?php echo __('GrÃ¶Ãe', 'wpsg'); ?></th>
-					<th class="col_action"></th>
-				</tr>
+
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitysave', __('Speichern erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitysave'), array('label' => __('Dokumentenberechtigung', 'wpsg'))); ?>
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securityprint', __('Drucken erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securityprint')); ?>
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitymod', __('Modifizieren erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitymod')); ?>
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitynote', __('Bemerkungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitynote')); ?>
+
+            <?php echo wpsg_drawForm_TextStart(); ?>
+            <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?></p>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
+            <?php echo wpsg_drawForm_TextEnd(__('Mail fÃŒr Individualisierungsbericht', 'wpsg'), array('noP' => true)); ?>
+            <?php echo wpsg_drawForm_TextStart(); ?>
+            <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?></p>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
+            <?php echo wpsg_drawForm_TextEnd(__('Mail fÃŒr Downloads an Kunden', 'wpsg'), array('noP' => true)); ?>
+            <?php echo wpsg_drawForm_TextStart(); ?>
+            <p><?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgefÃŒhrt', 'wpsg')); ?></p>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
+            <?php echo wpsg_drawForm_TextEnd(__('Letzte AusfÃŒhrung des Crons', 'wpsg'), array('noP' => true)); ?>
+
+        </div>
+
+        <div role="tabpanel" class="tab-pane" id="tab2">
+
+            <table class="table table-body-striped wpsg_mod_downloadplus_fieldtable">
+                <thead>
+                    <tr>
+                        <th class="col_bezeichnung"></th>
+                        <th class="col_x"><?php echo __('X', 'wpsg'); ?></th>
+                        <th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>
+                        <th class="col_align"><?php echo __('Zentriert', 'wpsg'); ?></th>
+                        <th class="col_bg"><?php echo __('Hintergrund', 'wpsg'); ?></th>
+                        <th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>
+                        <th class="col_alpha"><?php echo __('Opaque', 'wpsg'); ?></th>
+                        <th class="col_angle"><?php echo __('Winkel', 'wpsg'); ?></th>
+                        <th class="col_groesse"><?php echo __('GrÃ¶Ãe', 'wpsg'); ?></th>
+                        <th class="col_action"></th>
+                    </tr>
+                </thead>
 				<?php for ($i = 0; $i < 10; $i ++) { ?>
-				<tr>
-					<td><?php echo '#'.($i + 1); ?></td>					
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][x]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['x']); ?>" />
-					</td>
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][y]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['y']); ?>" />
-					</td>
-					<td class="col_align">
-						<input type="hidden" name="text[<?php echo $i; ?>][align]" value="0" />
-						<input class="wpsg_hideBarcode" type="checkbox" name="text[<?php echo $i; ?>][align]" value="1" <?php echo (($this->view['arTexte'][$i]['align'] == '1')?'checked="checked"':''); ?> />
-					</td>
-					<td class="col_bg">
-						<input type="hidden" name="text[<?php echo $i; ?>][bg]" value="0" />
-						<input class="wpsg_hideBarcode" type="checkbox" name="text[<?php echo $i; ?>][bg]" value="1" <?php echo (($this->view['arTexte'][$i]['bg'] == '1')?'checked="checked"':''); ?> />
-					</td>
-					<td>
-						<input class="wpsg_hideBarcode" type="text" style="width:100%;" name="text[<?php echo $i; ?>][color]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['color']); ?>" />
-					</td>
-					<td>
-						<input class="wpsg_hideBarcode" type="text" style="width:100%;" name="text[<?php echo $i; ?>][alpha]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['alpha']); ?>" />
-					</td>					
-					<td>
-						<input class="wpsg_hideBarcode" type="text" style="width:100%;" name="text[<?php echo $i; ?>][angle]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['angle']); ?>" />
-					</td>
-					<td>
-						<select name="text[<?php echo $i; ?>][fontsize]" style="width:100%;">
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "4")?'selected="selected"':''); ?> value="4">4</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "5")?'selected="selected"':''); ?> value="5">5</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "6")?'selected="selected"':''); ?> value="6">6</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "7")?'selected="selected"':''); ?> value="7">7</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "8")?'selected="selected"':''); ?> value="8">8</option>				
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "9")?'selected="selected"':''); ?> value="9">9</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "10")?'selected="selected"':''); ?> value="10">10</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "11")?'selected="selected"':''); ?> value="11">11</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "12")?'selected="selected"':''); ?> value="12">12</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "13")?'selected="selected"':''); ?> value="13">13</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "14")?'selected="selected"':''); ?> value="14">14</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "16")?'selected="selected"':''); ?> value="16">16</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "18")?'selected="selected"':''); ?> value="18">18</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "20")?'selected="selected"':''); ?> value="20">20</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "22")?'selected="selected"':''); ?> value="22">22</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "24")?'selected="selected"':''); ?> value="24">24</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "26")?'selected="selected"':''); ?> value="26">26</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "28")?'selected="selected"':''); ?> value="28">28</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "30")?'selected="selected"':''); ?> value="30">30</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "32")?'selected="selected"':''); ?> value="32">32</option>
-							<option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "34")?'selected="selected"':''); ?> value="34">34</option>
-						</select>
-					</td>
-					<td>			
-						<label><input type="checkbox" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo (($this->view['arTexte'][$i]['aktiv'] == 1)?'checked="checked"':''); ?> />&nbsp;<?php echo __("Aktiv", "wpsg"); ?></label>
-						<a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig"></a>
-					</td>
-				</tr>
-				<tr>
-					<td></td>
-					<td class="col_freitext_label"><?php echo __('Freitext', 'wpsg'); ?>:</td>
-					<td colspan="7" class="col_freitext">
-						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][text]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['text']); ?>" />
-					</td>
-					<td>
-						<select class="fontselect" name="text[<?php echo $i; ?>][font]" style="width:100%;"> 
-							<?php foreach ($this->view['wpsg_mod_downloadplus']['arFonts'] as $k => $v) { ?>
-							<option value="<?php echo wpsg_hspc($k); ?>" <?php echo (($k == $this->view['arTexte'][$i]['font'])?'selected="selected"':''); ?>><?php echo wpsg_hspc($v); ?></option>
-							<?php } ?>
-						</select>
-					</td>
-				</tr>
-				<?php if ($i < 9) { ?>
-				<tr class="wpsg_border_bottom"><td colspan="10"></td></tr>
-				<?php } ?>
+                <tbody>
+                    <tr>
+                        <td><?php echo '#'.($i + 1); ?></td>
+                        <td>
+                            <input type="text" style="width:100%;" name="text[<?php echo $i; ?>][x]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['x']); ?>" />
+                        </td>
+                        <td>
+                            <input type="text" style="width:100%;" name="text[<?php echo $i; ?>][y]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['y']); ?>" />
+                        </td>
+                        <td class="col_align">
+                            <input type="hidden" name="text[<?php echo $i; ?>][align]" value="0" />
+                            <input class="wpsg_hideBarcode" type="checkbox" name="text[<?php echo $i; ?>][align]" value="1" <?php echo (($this->view['arTexte'][$i]['align'] == '1')?'checked="checked"':''); ?> />
+                        </td>
+                        <td class="col_bg">
+                            <input type="hidden" name="text[<?php echo $i; ?>][bg]" value="0" />
+                            <input class="wpsg_hideBarcode" type="checkbox" name="text[<?php echo $i; ?>][bg]" value="1" <?php echo (($this->view['arTexte'][$i]['bg'] == '1')?'checked="checked"':''); ?> />
+                        </td>
+                        <td>
+                            <input class="wpsg_hideBarcode" type="text" style="width:100%;" name="text[<?php echo $i; ?>][color]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['color']); ?>" />
+                        </td>
+                        <td>
+                            <input class="wpsg_hideBarcode" type="text" style="width:100%;" name="text[<?php echo $i; ?>][alpha]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['alpha']); ?>" />
+                        </td>
+                        <td>
+                            <input class="wpsg_hideBarcode" type="text" style="width:100%;" name="text[<?php echo $i; ?>][angle]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['angle']); ?>" />
+                        </td>
+                        <td>
+                            <select name="text[<?php echo $i; ?>][fontsize]" style="width:100%;">
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "4")?'selected="selected"':''); ?> value="4">4</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "5")?'selected="selected"':''); ?> value="5">5</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "6")?'selected="selected"':''); ?> value="6">6</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "7")?'selected="selected"':''); ?> value="7">7</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "8")?'selected="selected"':''); ?> value="8">8</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "9")?'selected="selected"':''); ?> value="9">9</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "10")?'selected="selected"':''); ?> value="10">10</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "11")?'selected="selected"':''); ?> value="11">11</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "12")?'selected="selected"':''); ?> value="12">12</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "13")?'selected="selected"':''); ?> value="13">13</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "14")?'selected="selected"':''); ?> value="14">14</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "16")?'selected="selected"':''); ?> value="16">16</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "18")?'selected="selected"':''); ?> value="18">18</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "20")?'selected="selected"':''); ?> value="20">20</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "22")?'selected="selected"':''); ?> value="22">22</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "24")?'selected="selected"':''); ?> value="24">24</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "26")?'selected="selected"':''); ?> value="26">26</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "28")?'selected="selected"':''); ?> value="28">28</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "30")?'selected="selected"':''); ?> value="30">30</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "32")?'selected="selected"':''); ?> value="32">32</option>
+                                <option <?php echo (($this->view['arTexte'][$i]['fontsize'] == "34")?'selected="selected"':''); ?> value="34">34</option>
+                            </select>
+                        </td>
+                        <td>
+                            <input type="checkbox" title="<?php echo __('Hier kÃ¶nnen Sie die Zeile deaktivieren/aktivieren.', 'wpsg'); ?>" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo (($this->view['arTexte'][$i]['aktiv'] == 1)?'checked="checked"':''); ?> />&nbsp
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td class="col_freitext_label"><?php echo __('Freitext', 'wpsg'); ?>:</td>
+                        <td colspan="6" class="col_freitext">
+                            <input type="text" style="width:100%;" name="text[<?php echo $i; ?>][text]" value="<?php echo wpsg_hspc($this->view['arTexte'][$i]['text']); ?>" />
+                        </td>
+                        <td colspan="2">
+                            <select class="fontselect" name="text[<?php echo $i; ?>][font]" style="width:100%;">
+                                <?php foreach ($this->view['wpsg_mod_downloadplus']['arFonts'] as $k => $v) { ?>
+                                <option value="<?php echo wpsg_hspc($k); ?>" <?php echo (($k == $this->view['arTexte'][$i]['font'])?'selected="selected"':''); ?>><?php echo wpsg_hspc($v); ?></option>
+                                <?php } ?>
+                            </select>
+                        </td>
+                    </tr>
+                </tbody>
 				<?php } ?>
 			</table>
-		</div>
-		
-		<div id="tabcontent3" class="tabcontent">
-		
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_memorylimit', __('Versuche Speicherlimit hochzusetzen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_memorylimit'), array('help' => 'wpsg_mod_downloadplus_memorylimit')); ?>			
+
+        </div>
+
+        <div role="tabpanel" class="tab-pane" id="tab3">
+
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_memorylimit', __('Versuche Speicherlimit hochzusetzen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_memorylimit'), array('help' => 'wpsg_mod_downloadplus_memorylimit')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_timelimit', __('Versuche die AusfÃŒhrungszeit hochzusetzen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_timelimit'), array('help' => 'wpsg_mod_downloadplus_timelimit')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_numberformat', __('Format der Downloadnummer', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_numberformat'), array('help' => 'wpsg_mod_downloadplus_numberformat')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_startnumber', __('Downloadnummer Startnummer', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_startnumber'), array('help' => 'wpsg_mod_downloadplus_startnumber')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_attachement', __('Angepasste Dokumente als Anhang versenden', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_attachement'), array('help' => 'wpsg_mod_downloadplus_attachement')); ?>
-					
-		</div>
-		
-		<div id="tabcontent4" class="tabcontent">
-		
-			<p>
-				<?php echo __('Das Downloadplus Modul ist eine erweiterung des Downloadprodukt Moduls und ermÃ¶glicht das Individualisieren von PDF Dokumenten.', 'wpsg'); ?>				
+
+        </div>
+
+        <div role="tabpanel" class="tab-pane" id="tab4">
+
+            <p>
+				<?php echo __('Das Downloadplus Modul ist eine erweiterung des Downloadprodukt Moduls und ermÃ¶glicht das Individualisieren von PDF Dokumenten.', 'wpsg'); ?>
 			</p>
 			<p>
 				<?php echo __('Weitere Informationen erhalten Sie auf der <a href="http://wpshopgermany.de/?p=1426">Hilfe Seite</a> oder in unserem <a href="http://forum.maennchen1.de">Support Forum</a>.', 'wpsg'); ?>
 			</p>
-			
+
 			<p>
 				<?php echo __('Eintrag in der Crontab:', 'wpsg'); ?>:<br /><br />
 				<span style="font-weight:bold; font-family:monospace;">
-					*/5   *   *   *  *    /usr/bin/php <?php echo WPSG_PATH.DIRECTORY_SEPARATOR; ?>cron.php 
+					*/5   *   *   *  *    /usr/bin/php <?php echo WPSG_PATH.DIRECTORY_SEPARATOR; ?>cron.php
 				</span>
 			</p>
@@ -219,71 +189,23 @@
 				<?php echo __('HTTP Aufruf des Cron Scriptes:', 'wpsg'); ?><br /><br />
 				<a href="<?php echo WPSG_PLUGIN_URL; ?>/<?php echo WPSG_FOLDERNAME; ?>/cron.php" target="_blank"><?php echo WPSG_PLUGIN_URL; ?>/wpshopgermany/cron.php</a>
-			</p>		
-			
-		</div>
-		
-	</div>
+			</p>
+
+        </div>
+
+    </div>
 </div>
 
 <script type="text/javascript">/* <![CDATA[ */
- 
-	function wpsg_mod_downloadplus_switchAccepted()
-	{
-
-		if (jQuery('#wpsg_mod_downloadplus_accepted').val() == '1')
-			jQuery('#wpsg_mod_downloadplus_downloads').parent().parent().show();
-		else
-			jQuery('#wpsg_mod_downloadplus_downloads').parent().parent().hide();
-		
-		if (jQuery('#wpsg_mod_downloadplus_accepted').val() == '2')
-			jQuery('#wpsg_mod_downloadplus_days').parent().parent().show();
-		else
-			jQuery('#wpsg_mod_downloadplus_days').parent().parent().hide();
-		
-	} // function wpsg_mod_downloadplus_switchAccepted()
-
-	function wpsg_mod_downloadplus_switchRange()
-	{
-
-		if (jQuery('#wpsg_mod_downloadplus_range').val() == '1')
-			jQuery('#wpsg_mod_downloadplus_rangefield').show();
-		else
-			jQuery('#wpsg_mod_downloadplus_rangefield').hide();
-		
-	} // function wpsg_mod_downloadplus_switchRange()
-	
-	jQuery(document).ready(function() {
-
-		jQuery('.wpsg_mod_downloadplus_fieldtable select.fontselect').bind('change', function() {
-
-			if (jQuery(this).val() == 'EAN13' || jQuery(this).val() == 'Code128' || jQuery(this).val() == 'UPC_A')
-			{
- 
-				jQuery(this).parents('tr').prev().find('input.wpsg_hideBarcode').hide();
-				
-			}
-			else
-			{
-			 
-				jQuery(this).parents('tr').prev().find('input.wpsg_hideBarcode').show();
-				
-			}
-			
-		} ).change();
-		 
-		jQuery('#wpsg_mod_downloadplus_range').bind('change', function() { wpsg_mod_downloadplus_switchRange(); } );
-		jQuery('#wpsg_mod_downloadplus_accepted').bind('change', function() { wpsg_mod_downloadplus_switchAccepted(); } );
-
-		wpsg_mod_downloadplus_switchAccepted();
-		wpsg_mod_downloadplus_switchRange();
-		
-		jQuery('#wpsg_tab').wpsg_tab( { 
-			'cookiename': 'wpsg_pdfdownload_tab',
-			'tab2': function() {
-				jQuery('.tablink').show();
-			}
-		} );
-	} );
-
-	/* ]]> */</script>
-		
+
+    jQuery(document).ready(function() {
+
+        jQuery('.wpsg_change').on('change', function() {
+
+            jQuery('.' + jQuery(this).attr("id")).hide();
+            jQuery('.' + jQuery(this).attr("id") + '_' + jQuery(this).val()).show();
+
+        } ).change();
+
+    } );
+
+/* ]]> */</script>
