Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 5748)
+++ /controller/wpsg_AdminController.class.php	(revision 5749)
@@ -1853,5 +1853,7 @@
 				$xpath = new DOMXPath($doc);
 				$entries = $xpath->query('//div[@id="wikipage"]');
-				
+
+				$strReturn = '';
+
 				foreach ($entries as $entry) {
 	 
Index: /views/admin/module.phtml
===================================================================
--- /views/admin/module.phtml	(revision 5748)
+++ /views/admin/module.phtml	(revision 5749)
@@ -145,9 +145,9 @@
 			
 				if (check && !jQuery(this).parent().hasClass('modul_akt')) jQuery(this).parent().hide();
-				else if (search != '')
+				else if (jQuery.trim(search) != '')
 				{
 	
 					var re = new RegExp(search, 'i');
-	
+
 					if (!jQuery(this).html().match(re)) jQuery(this).parent().hide();
 					else jQuery(this).parent().show();
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 5748)
+++ /views/css/admin.css	(revision 5749)
@@ -40,4 +40,5 @@
 #wpsg-bs .checkbox input { margin-top:1px; }
 #wpsg-bs .info { font-style:italic; }
+#wpsg-bs .tab-pane { padding-top:15px; }
 
 /* Allgemeine Klassen */
@@ -201,3 +202,13 @@
 #wpsg_oc_list .wpsg_mod_ordercondition_text { width:100%; height:150px; }
 
+/* Modul Lieferschein */
+.wpsg_mod_deliverynote_fieldtable { font-size:12px; }
+.wpsg_mod_deliverynote_fieldtable .col_bezeichnung { width:125px; }
+.wpsg_mod_deliverynote_fieldtable .col_x,
+.wpsg_mod_deliverynote_fieldtable .col_y { width:50px; }
+.wpsg_mod_deliverynote_fieldtable .col_color { width:80px; }
+.wpsg_mod_deliverynote_fieldtable .col_groesse { width:50px; }
+.wpsg_foottextlist .col_standard { text-align:center; }
+
 #beschreibung_ifr { height:500px; }
+
Index: /views/mods/mod_deliverynote/foottext_list.phtml
===================================================================
--- /views/mods/mod_deliverynote/foottext_list.phtml	(revision 5748)
+++ /views/mods/mod_deliverynote/foottext_list.phtml	(revision 5749)
@@ -9,53 +9,59 @@
 <p><?php echo __('Bisher keine Fußtexte angelegt!', 'wpsg'); ?></p>
 <?php } else { ?>
-<table class="wpsg_foottextlist">			
-	<tr>
-		<th class="col_kuerzel"><?php echo __('KÃŒrzel', 'wpsg'); ?></th>
-		<th class="col_text"><?php echo __('Text', 'wpsg'); ?></th>
-		<th class="col_standard"><?php echo __('Standard', 'wpsg'); ?></th>
-		<th class="col_aktion"></th>
-	</tr>
-	<?php foreach ((array)$this->view['wpsg_mod_deliverynote']['data'] as $key => $d) { ?>
-	<tr>
-		<td class="col_kuerzel wpsg_editable" id="wpsg_foottext_0_<?php echo $key; ?>"><?php echo wpsg_hspc($d[0]); ?></td>
-		<td class="col_text wpsg_editable" id="wpsg_foottext_1_<?php echo $key; ?>"><?php echo wpsg_hspc($d[1]); ?></td>
-		<td class="col_standard"><input type="radio" value="<?php echo $key; ?>" <?php echo (($this->get_option('wpsg_mod_deliverynote_foottext_standard') == $key)?'checked="checked"':''); ?> class="wpsg_mod_deliverynote_foottext_standard" name="wpsg_mod_deliverynote_foottext_standard" /></td>
-		<td class="col_aktion">
-		
-			<a onclick="return wpsg_removeFooter(<?php echo $key; ?>);" title="<?php echo __('Fußtext löschen', 'wpsg'); ?>'" href="#" class="wpsg_icon wpsg_icon_center wpsg_icon_remove"></a>
-			
-			<script type="text/javascript">
+<table class="table table-body-striped wpsg_foottextlist">
+    <thead>
+        <tr>
+            <th class="col_kuerzel"><?php echo __('KÃŒrzel', 'wpsg'); ?></th>
+            <th class="col_text"><?php echo __('Text', 'wpsg'); ?></th>
+            <th class="col_standard"><?php echo __('Standard', 'wpsg'); ?></th>
+            <th class="col_aktion"></th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php foreach ((array)$this->view['wpsg_mod_deliverynote']['data'] as $key => $d) { ?>
+        <tr>
+            <td class="col_kuerzel"><span id="wpsg_foottext_0_<?php echo $key; ?>" class="wpsg_editable"><?php echo wpsg_hspc($d[0]); ?></span></td>
+            <td class="col_text"><span class="wpsg_editable" id="wpsg_foottext_1_<?php echo $key; ?>"><?php echo wpsg_hspc($d[1]); ?></span></td>
+            <td class="col_standard"><input type="radio" value="<?php echo $key; ?>" <?php echo (($this->get_option('wpsg_mod_deliverynote_foottext_standard') == $key)?'checked="checked"':''); ?> class="wpsg_mod_deliverynote_foottext_standard" name="wpsg_mod_deliverynote_foottext_standard" /></td>
+            <td class="col_aktion">
 
-				jQuery(document).ready(function() {
- 
-					jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
-						submitdata: { 
-				    		field: '0',
-				    		field_id: '<?php echo $key; ?>'
-						}, 					
-						submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-					});	
-	
-					jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
-						submitdata: { 
-				    		field: '1',
-				    		field_id: '<?php echo $key; ?>'
-						}, 					
-						submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-					});	
+                <a onclick="return wpsg_removeFooter(<?php echo $key; ?>);" title="<?php echo __('Fußtext löschen', 'wpsg'); ?>'" href="#" class="">
+                    <span class="glyphicon glyphicon-trash"></span>
+                </a>
 
-				} );
-					
-			</script>
-			
-		</td>
-	</tr>
-	<?php } ?>
+                <script type="text/javascript">/* <![CDATA[ */
+
+                    jQuery(document).ready(function() {
+
+                        jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
+                            submitdata: {
+                                field: '0',
+                                field_id: '<?php echo $key; ?>'
+                            },
+                            submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+                            placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                            indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+                            tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+                        });
+
+                        jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
+                            submitdata: {
+                                field: '1',
+                                field_id: '<?php echo $key; ?>'
+                            },
+                            submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+                            placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                            indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+                            tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+                        });
+
+                    } );
+
+                /* ]]> */</script>
+
+            </td>
+        </tr>
+        <?php } ?>
+    </tbody>
 </table>
 <?php } ?>
Index: /views/mods/mod_deliverynote/settings_edit.phtml
===================================================================
--- /views/mods/mod_deliverynote/settings_edit.phtml	(revision 5748)
+++ /views/mods/mod_deliverynote/settings_edit.phtml	(revision 5749)
@@ -6,137 +6,125 @@
 
 ?>
-<br />
-<div class="wpsg_admin_box" id="wpsg_tab">	
-	<div class="head">
-		<div class="title">
-			<div class="tab" id="tab1"><?php echo __('Vordefinierte Textfelder', 'wpsg'); ?></div>
-			<div class="tab" id="tab2"><?php echo __('Fußzeile', 'wpsg'); ?></div>			
-			<div class="tab" id="tab3"><?php echo __('Sonstiges', 'wpsg'); ?></div>
-			<div class="tabcontent tablink">
-				<a href="" title="<?php echo __('Neues Feld fÃŒr die Fußzeile hinzufÃŒgen', 'wpsg'); ?>" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addFooter();"></a>
+
+<div>
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Vordefinierte Textfelder', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Fußzeile', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab3" aria-controls="messages" role="tab" data-toggle="tab"><?php echo __('Sonstiges', 'wpsg'); ?></a></li>
+    </ul>
+    <div class="tab-content">
+        <div role="tabpanel" class="tab-pane active" id="tab1">
+
+            <?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_adressrow', __('Adresszeile', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_adressrow'), array('help' => 'wpsg_mod_deliverynote_adressrow')); ?>
+
+            <?php echo wpsg_drawForm_TextStart(); ?>
+                <?php if ($this->view['wpsg_mod_deliverynote']['bp'] === false) { ?>
+                <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
+                <?php } else { ?>
+                <a href="<?php echo $this->view['wpsg_mod_deliverynote']['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
+                <?php } ?>
+                <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
+                <input type="file" name="wpsg_mod_deliverynote_bp">
+                <?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = '
+                    <label>
+						<input type="checkbox" name="wpsg_mod_deliverynote_bp_del" value="1" />&nbsp;'.__('Löschen', 'wpsg').'
+					</label>';
+                } ?>
+            <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg').$strSuffix, array('noP' => true, 'help' => 'wpsg_mod_deliverynote_bp')); ?>
+
+            <?php echo wpsg_drawForm_TextStart(); ?>
+                <?php if ($this->view['wpsg_mod_deliverynote']['logo'] === false) { ?>
+                <p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>
+                <?php } else { ?>
+                <a href="<?php echo $this->view['wpsg_mod_deliverynote']['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
+                <?php } ?>
+                <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
+                <input type="file" name="wpsg_mod_deliverynote_logo">
+                <?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = '  
+					<label>
+						<input type="checkbox" name="wpsg_mod_deliverynote_logo_del" value="1" />&nbsp;'.__('Löschen', 'wpsg').'
+					</label>';
+				} ?>
+            <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'help' => 'wpsg_mod_deliverynote_logo')); ?>
+
+			<br />
+
+			<table class="table table-body-striped wpsg_mod_deliverynote_fieldtable">
+                <thead>
+                    <tr>
+                        <th class="col_bezeichnung"><?php echo __('Bezeichnung', 'wpsg'); ?></th>
+                        <th class="col_freitext"><?php echo __('Freitext', 'wpsg'); ?></th>
+                        <th class="col_x"><?php echo __('X', 'wpsg'); ?></th>
+                        <th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>
+                        <th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>
+                        <th class="col_groesse"><?php echo __('Größe', 'wpsg'); ?></th>
+                        <th class="col_action"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($this->view['wpsg_mod_deliverynote']['fields'] as $f => $field_name) { ?>
+                    <tr>
+                        <td><?php echo wpsg_hspc($field_name); ?></td>
+                        <td>
+                            <input type="text" style="width:100%;" name="text[<?php echo $f; ?>][text]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['text']); ?>" />
+                        </td>
+                        <td>
+                            <input type="text" style="width:100%;" name="text[<?php echo $f; ?>][x]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['x']); ?>" />
+                        </td>
+                        <td>
+                            <input type="text" style="width:100%;" name="text[<?php echo $f; ?>][y]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['y']); ?>" />
+                        </td>
+                        <td>
+                            <input type="text" style="width:100%;" name="text[<?php echo $f; ?>][color]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['color']); ?>" />
+                        </td>
+                        <td>
+                            <select name="text[<?php echo $f; ?>][fontsize]" style="width:100%;">
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "8")?'selected="selected"':''); ?> value="8">8</option>
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "9")?'selected="selected"':''); ?> value="9">9</option>
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "10")?'selected="selected"':''); ?> value="10">10</option>
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "11")?'selected="selected"':''); ?> value="11">11</option>
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "12")?'selected="selected"':''); ?> value="12">12</option>
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "13")?'selected="selected"':''); ?> value="13">13</option>
+                                <option <?php echo ((wpsg_getStr($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize']) == "14")?'selected="selected"':''); ?> value="14">14</option>
+                            </select>
+                        </td>
+                        <td>
+                            <input type="checkbox" title="<?php echo __('Diese Checkbox aktivieren, damit die Textzeile verwendet wird.'. 'wpsg'); ?>" value="1" name="text[<?php echo $f; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['aktiv']))?'checked="checked"':''); ?> />
+                        </td>
+                    </tr>
+                    <?php } ?>
+                </tbody>
+			</table>
+
+			<input class="button" onclick="if (!confirm('<?php echo __('Sind Sie sich sicher? Ihre bisherigen Einstellungen gehen verloren!', 'wpsg'); ?>')) return false; else location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;do=reset&amp;noheader=1';" type="button" value="<?php echo __('Standardeinstellungen laden', 'wpsg'); ?>" />
+
+            <br /><br />
+
+			<div class="info">
+				<?php echo __('Die Angaben fÃŒr X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?><br />
+				<?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFF fÃŒr weiß, #000000 fÃŒr schwarz).', 'wpsg'); ?>
 			</div>
-			<div class="wpsg_clear"></div>
-		</div>
-	</div>
-	<div class="content">
-		<div id="tabcontent1" class="tabcontent">
-			
-			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_adressrow', __('Adresszeile', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_adressrow')); ?>
-			<div class="wpsg_hinweis"><?php echo __('Diese Zeile wird klein oberhalb der Kundenadresse platziert', 'wpsg'); ?></div>
+
 			<br />
-			
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Briefpapier (PDF/JPG)', 'wpsg'); ?>:</label><br />
-					<?php if ($this->view['wpsg_mod_deliverynote']['bp'] !== false) { ?>
-					<label>
-						<input type="checkbox" name="wpsg_mod_deliverynote_bp_del" value="1" />&nbsp;<?php echo __('Löschen', 'wpsg'); ?>
-					</label>
-					<?php } ?>
-				</div>
-				<div class="wpsg_form_right">
-					<?php if ($this->view['wpsg_mod_deliverynote']['bp'] === false) { ?>
-					<p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
-					<?php } else { ?>
-					<a href="<?php echo $this->view['wpsg_mod_deliverynote']['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
-					<?php } ?>					
-					<a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
-					<input type="file" name="wpsg_mod_deliverynote_bp">
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>
-			
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Logo (JPG)', 'wpsg'); ?>:</label><br />
-					<?php if ($this->view['wpsg_mod_deliverynote']['logo'] !== false) { ?>
-					<label>
-						<input type="checkbox" name="wpsg_mod_deliverynote_logo_del" value="1" />&nbsp;<?php echo __('Löschen', 'wpsg'); ?>
-					</label>
-					<?php } ?>
-				</div>
-				<div class="wpsg_form_right">
-					<?php if ($this->view['wpsg_mod_deliverynote']['logo'] === false) { ?>
-					<p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>
-					<?php } else { ?>
-					<a href="<?php echo $this->view['wpsg_mod_deliverynote']['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
-					<?php } ?>
-					<a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
-					<input type="file" name="wpsg_mod_deliverynote_logo">
-				</div>
-				<div class="wpsg_clear"></div>
-			</div>
-			
-			<div class="wpsg_hinweis"><?php echo __('Das Briefpapier wird hinter die gesamte Seite gelegt, das Logo wird rechts oben auf jeder Seite platziert. (96 dpi)', 'wpsg'); ?></div>
-			<br />
-			
-			<table class="wpsg_mod_deliverynote_fieldtable">
-				<tr>
-					<th class="col_bezeichnung"><?php echo __('Bezeichnung', 'wpsg'); ?></th>
-					<th class="col_freitext"><?php echo __('Freitext', 'wpsg'); ?></th>
-					<th class="col_x"><?php echo __('X', 'wpsg'); ?></th>
-					<th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>
-					<th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>
-					<th class="col_groesse"><?php echo __('Größe', 'wpsg'); ?></th>
-					<th class="col_action"></th>
-				</tr>
-				<?php foreach ($this->view['wpsg_mod_deliverynote']['fields'] as $f => $field_name) { ?>
-				<tr>
-					<td><?php echo wpsg_hspc($field_name); ?></td>
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][text]" value="<?php echo wpsg_hspc($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['text']); ?>" />
-					</td>
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][x]" value="<?php echo wpsg_hspc($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['x']); ?>" />
-					</td>
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][y]" value="<?php echo wpsg_hspc($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['y']); ?>" />
-					</td>
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][color]" value="<?php echo wpsg_hspc($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['color']); ?>" />
-					</td>
-					<td>
-						<select name="text[<?php echo $f; ?>][fontsize]" style="width:100%;">
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "8")?'selected="selected"':''); ?> value="8">8</option>				
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "9")?'selected="selected"':''); ?> value="9">9</option>
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "10")?'selected="selected"':''); ?> value="10">10</option>
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "11")?'selected="selected"':''); ?> value="11">11</option>
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "12")?'selected="selected"':''); ?> value="12">12</option>
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "13")?'selected="selected"':''); ?> value="13">13</option>
-							<option <?php echo (($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['fontsize'] == "14")?'selected="selected"':''); ?> value="14">14</option>
-						</select>
-					</td>
-					<td>			
-						<label><input type="checkbox" value="1" name="text[<?php echo $f; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['wpsg_mod_deliverynote']['arTexte'][$f]['aktiv']))?'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_deliverynote_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_fieldconfig"></a>
-					</td>
-				</tr>
-				<?php } ?>
-			</table>
-						
-			<br />
-			
-			<input style="float:right;" class="button" onclick="if (!confirm('<?php echo __('Sind Sie sich sicher? Ihre bisherigen Einstellungen gehen verloren!', 'wpsg'); ?>')) return false; else location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;do=reset&amp;noheader=1';" type="button" value="<?php echo __('Standardeinstellungen laden', 'wpsg'); ?>" />
-			
-			<div class="wpsg_hinweis">
-				<?php echo __('Die Angaben fÃŒr X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?><br />
-				<?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFF fÃŒr weiß, #000000 fÃŒr schwarz).', 'wpsg'); ?> 
-			</div>
-			<br />
-			
-		</div>
-		<div id="tabcontent2" class="tabcontent">
-			
-			<div id="foottext_list"><?php echo $this->view['foottext_list']; ?></div>
-			<br />
-			
-			<div class="wpsg_hinweis">
+
+        </div>
+        <div role="tabpanel" class="tab-pane" id="tab2">
+
+            <div id="foottext_list"><?php echo $this->view['foottext_list']; ?></div>
+
+            <br />
+
+            <a title="<?php echo __('Neue Fußzeile anlegen', 'wpsg'); ?>" href="" class="" onclick="return wpsg_addFooter();"><span class="glyphicon wpsg-glyphicon glyphicon-plus"></span><?php echo __('Neue Fußzeile anlegen.', 'wpsg'); ?></a>
+
+            <br /><br />
+
+			<div class="info">
 				<?php echo __('Hier können Sie Texte vordefinieren, die sie unter den Lieferschein setzen können.', 'wpsg'); ?>
 			</div>
-			
-		</div>		
-		<div id="tabcontent3" class="tabcontent">
-		
-			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_nrformat', __('Format der Lieferscheinnummer', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_nrformat'), array('help' => 'wpsg_mod_deliverynote_nrformat')); ?>
+
+        </div>
+        <div role="tabpanel" class="tab-pane" id="tab3">
+
+            <?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_nrformat', __('Format der Lieferscheinnummer', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_nrformat'), array('help' => 'wpsg_mod_deliverynote_nrformat')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_nr', __('Start fÃŒr Lieferscheinnummer', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_nr'), array('help' => 'wpsg_mod_deliverynote_nr')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_url', __('URL FÃŒr URL Benachrichtigung', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_url'), array('help' => 'wpsg_mod_deliverynote_url')); ?>
@@ -146,9 +134,9 @@
 				'0' => __('Nicht anzeigen', 'wpsg'),
 				'1' => __('In Spalte "Nr." zeigen', 'wpsg'),
-				'2' => __('Als extra Zeile anzeigen', 'wpsg')					
+				'2' => __('Als extra Zeile anzeigen', 'wpsg')
 			), $this->get_option('wpsg_mod_deliverynote_anr'), array('help' => 'wpsg_mod_deliverynote_anr')); ?>
-					
-		</div>
-	</div>
+
+        </div>
+      </div>
 </div>