From e85ee706635d0a8462f4c7c47fccd3cbd05eb2fa Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Wed, 13 Apr 2016 15:02:26 +0000
Subject: - Bereiche im Produktbackend

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5461 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/admin.css                                |   6 +-
 .../mod_basketteaser/produkt_addedit_sidebar.phtml |  18 ++
 .../mod_basketteaser/produkt_edit_sidebar.phtml    |  18 --
 .../mod_discount/produkt_addedit_sidebar.phtml     |  19 ++
 views/mods/mod_discount/produkt_edit_sidebar.phtml |  19 --
 .../produkt_addedit_sidebar.phtml                  |  25 ++
 .../mod_productgroups/produkt_edit_sidebar.phtml   |  25 --
 .../mod_productvars/produkt_addedit_sidebar.phtml  |  24 ++
 .../mod_productvars/produkt_edit_sidebar.phtml     |  24 --
 .../produkt_addedit_content.phtml                  |  45 ++++
 .../produkt_edit_content.phtml                     |  45 ----
 views/mods/mod_stock/produkt_edit_sidebar.phtml    |  35 +--
 .../mod_topseller/produkt_addedit_allgemein.phtml  |  18 ++
 .../mod_topseller/produkt_edit_allgemein.phtml     |  18 --
 .../mod_varianten/produkt_addedit_content.phtml    | 297 +++++++++++++++++++++
 .../mods/mod_varianten/produkt_edit_content.phtml  | 297 ---------------------
 16 files changed, 461 insertions(+), 472 deletions(-)
 create mode 100644 views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml
 delete mode 100644 views/mods/mod_basketteaser/produkt_edit_sidebar.phtml
 create mode 100644 views/mods/mod_discount/produkt_addedit_sidebar.phtml
 delete mode 100644 views/mods/mod_discount/produkt_edit_sidebar.phtml
 create mode 100644 views/mods/mod_productgroups/produkt_addedit_sidebar.phtml
 delete mode 100644 views/mods/mod_productgroups/produkt_edit_sidebar.phtml
 create mode 100644 views/mods/mod_productvars/produkt_addedit_sidebar.phtml
 delete mode 100644 views/mods/mod_productvars/produkt_edit_sidebar.phtml
 create mode 100644 views/mods/mod_produktattribute/produkt_addedit_content.phtml
 delete mode 100644 views/mods/mod_produktattribute/produkt_edit_content.phtml
 create mode 100644 views/mods/mod_topseller/produkt_addedit_allgemein.phtml
 delete mode 100644 views/mods/mod_topseller/produkt_edit_allgemein.phtml
 create mode 100644 views/mods/mod_varianten/produkt_addedit_content.phtml
 delete mode 100644 views/mods/mod_varianten/produkt_edit_content.phtml

diff --git a/views/css/admin.css b/views/css/admin.css
index cdbe36b..a46a738 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -123,4 +123,8 @@
 .wpsg_mod_produktattribute_table .col_typ { width:75px; }
 .wpsg_mod_produktattribute_table .col_id { width:15px; }
 .wpsg_mod_produktattribute_table .auswahlrow2 td { border-top:0px; }
-.wpsg_mod_produktattribute_table > tbody + tbody { border-top:0px; }
\ No newline at end of file
+.wpsg_mod_produktattribute_table > tbody + tbody { border-top:0px; }
+.wpsg_produkt_pa_label { margin-left:10px; }
+#wpsg_produktattribute .wpsg_form_field { padding:10px 0; }
+
+#beschreibung_ifr { height:500px; }
\ No newline at end of file
diff --git a/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml b/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml
new file mode 100644
index 0000000..1cc9c83
--- /dev/null
+++ b/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Template für die Integration des Warenkorbteaser Moduls in die Produktverwaltung
+	 * Sollte nicht verändert werden
+	 */
+
+?>
+<div id="wpsg_basketteaser" class="postbox">	
+	<h3 class="wpsg_handlediv">
+		<span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></span>
+		<span><?php echo __('Warenkorbteaserprodukt', 'wpsg'); ?> </span>
+	</h3>
+	<div class="inside">
+		<?php echo wpsg_drawForm_Input('mod_basketteaser_from', __('Von', 'wpsg'), wpsg_fromDate($this->view['data']['mod_basketteaser_from']), array('datepicker' => true)); ?>
+		<?php echo wpsg_drawForm_Input('mod_basketteaser_to', __('Bis', 'wpsg'), wpsg_fromDate($this->view['data']['mod_basketteaser_to']), array('datepicker' => true)); ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_basketteaser/produkt_edit_sidebar.phtml b/views/mods/mod_basketteaser/produkt_edit_sidebar.phtml
deleted file mode 100644
index 1cc9c83..0000000
--- a/views/mods/mod_basketteaser/produkt_edit_sidebar.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Integration des Warenkorbteaser Moduls in die Produktverwaltung
-	 * Sollte nicht verändert werden
-	 */
-
-?>
-<div id="wpsg_basketteaser" class="postbox">	
-	<h3 class="wpsg_handlediv">
-		<span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></span>
-		<span><?php echo __('Warenkorbteaserprodukt', 'wpsg'); ?> </span>
-	</h3>
-	<div class="inside">
-		<?php echo wpsg_drawForm_Input('mod_basketteaser_from', __('Von', 'wpsg'), wpsg_fromDate($this->view['data']['mod_basketteaser_from']), array('datepicker' => true)); ?>
-		<?php echo wpsg_drawForm_Input('mod_basketteaser_to', __('Bis', 'wpsg'), wpsg_fromDate($this->view['data']['mod_basketteaser_to']), array('datepicker' => true)); ?>
-	</div>
-</div>
\ No newline at end of file
diff --git a/views/mods/mod_discount/produkt_addedit_sidebar.phtml b/views/mods/mod_discount/produkt_addedit_sidebar.phtml
new file mode 100644
index 0000000..a2c272a
--- /dev/null
+++ b/views/mods/mod_discount/produkt_addedit_sidebar.phtml
@@ -0,0 +1,19 @@
+<?php
+
+	/**
+	 * Template für die Rabattkonfiguration innerhalb der Produktverwaltung
+	 */
+
+?>
+<div id="wpsg_discount" class="postbox">
+	<h3 class="wpsg_handlediv">
+		<span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></span>
+		<span><?php echo __('Produktrabatt', 'wpsg'); ?> </span>
+	</h3>
+	<div class="inside">	
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_from]', __('Start (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_discount']['data'][1])); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_to]', __('Ende (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_discount']['data'][2])); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_value]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['data'][3])); ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_discount/produkt_edit_sidebar.phtml b/views/mods/mod_discount/produkt_edit_sidebar.phtml
deleted file mode 100644
index a2c272a..0000000
--- a/views/mods/mod_discount/produkt_edit_sidebar.phtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Rabattkonfiguration innerhalb der Produktverwaltung
-	 */
-
-?>
-<div id="wpsg_discount" class="postbox">
-	<h3 class="wpsg_handlediv">
-		<span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></span>
-		<span><?php echo __('Produktrabatt', 'wpsg'); ?> </span>
-	</h3>
-	<div class="inside">	
-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_from]', __('Start (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_discount']['data'][1])); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_to]', __('Ende (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_discount']['data'][2])); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_value]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['data'][3])); ?>
-	</div>
-</div>
\ No newline at end of file
diff --git a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml
new file mode 100644
index 0000000..c1fab76
--- /dev/null
+++ b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Template für die Konfiguration der Produktvariablen innerhalb der Produktverwaltung
+	 */
+ 
+?>
+<div id="wpsg_productgroups" class="postbox">
+	<h3 class="wpsg_handlediv">
+		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
+		<span><?php echo __('Produktgruppen', 'wpsg'); ?> </span>
+	</h3>
+	<div class="inside">
+		
+		<?php if (sizeof($this->view['wpsg_mod_productgroups']['data']) <= 0) { ?>
+		<p><?php echo __('Bisher wurden keine Produktgruppen angelegt.', 'wpsg'); ?></p>
+		<?php } else { ?>
+		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
+		<?php } ?>
+		
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;page=wpsg-Productgroups"><?php echo __('Produktgruppenverwaltung', 'wpsg'); ?></a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_productgroups/produkt_edit_sidebar.phtml b/views/mods/mod_productgroups/produkt_edit_sidebar.phtml
deleted file mode 100644
index c1fab76..0000000
--- a/views/mods/mod_productgroups/produkt_edit_sidebar.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Konfiguration der Produktvariablen innerhalb der Produktverwaltung
-	 */
- 
-?>
-<div id="wpsg_productgroups" class="postbox">
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Produktgruppen', 'wpsg'); ?> </span>
-	</h3>
-	<div class="inside">
-		
-		<?php if (sizeof($this->view['wpsg_mod_productgroups']['data']) <= 0) { ?>
-		<p><?php echo __('Bisher wurden keine Produktgruppen angelegt.', 'wpsg'); ?></p>
-		<?php } else { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
-		<?php } ?>
-		
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;page=wpsg-Productgroups"><?php echo __('Produktgruppenverwaltung', 'wpsg'); ?></a>
-	</div>
-</div>
\ No newline at end of file
diff --git a/views/mods/mod_productvars/produkt_addedit_sidebar.phtml b/views/mods/mod_productvars/produkt_addedit_sidebar.phtml
new file mode 100644
index 0000000..5e91c7d
--- /dev/null
+++ b/views/mods/mod_productvars/produkt_addedit_sidebar.phtml
@@ -0,0 +1,24 @@
+<?php
+
+	/*
+	 * Aktivierung der Produktvariablen in der Produktvarwaltung
+	 */
+
+?>
+<div id="wpsg_productvars" class="postbox">
+	<h3 class="wpsg_handlediv">
+		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
+		<span><?php echo __('Produktvariablen', 'wpsg'); ?> </span>
+	</h3>
+	<div class="inside">
+		<?php if (is_array($this->view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?>		
+			<?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_pv['.$pv['id'].']', __($pv['name'], 'wpsg'), ((in_array($pv['id'], (array)$this->view['wpsg_mod_productvars']['productvars_set']))?true:false)); ?>
+			<?php } ?>
+		<?php } else { ?>
+		 	<?php echo __('Bisher keine Produktvariablen angelegt.', 'wpsg'); ?>
+		<?php } ?>
+		<br />
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=wpsg_mod_productvars"><?php echo __('Zur Produktvariablenverwaltung', 'wpsg'); ?></a>
+	</div>
+</div>
diff --git a/views/mods/mod_productvars/produkt_edit_sidebar.phtml b/views/mods/mod_productvars/produkt_edit_sidebar.phtml
deleted file mode 100644
index 5e91c7d..0000000
--- a/views/mods/mod_productvars/produkt_edit_sidebar.phtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-	/*
-	 * Aktivierung der Produktvariablen in der Produktvarwaltung
-	 */
-
-?>
-<div id="wpsg_productvars" class="postbox">
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Produktvariablen', 'wpsg'); ?> </span>
-	</h3>
-	<div class="inside">
-		<?php if (is_array($this->view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?>		
-			<?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_pv['.$pv['id'].']', __($pv['name'], 'wpsg'), ((in_array($pv['id'], (array)$this->view['wpsg_mod_productvars']['productvars_set']))?true:false)); ?>
-			<?php } ?>
-		<?php } else { ?>
-		 	<?php echo __('Bisher keine Produktvariablen angelegt.', 'wpsg'); ?>
-		<?php } ?>
-		<br />
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=wpsg_mod_productvars"><?php echo __('Zur Produktvariablenverwaltung', 'wpsg'); ?></a>
-	</div>
-</div>
diff --git a/views/mods/mod_produktattribute/produkt_addedit_content.phtml b/views/mods/mod_produktattribute/produkt_addedit_content.phtml
new file mode 100644
index 0000000..e79458a
--- /dev/null
+++ b/views/mods/mod_produktattribute/produkt_addedit_content.phtml
@@ -0,0 +1,45 @@
+<?php
+
+	/**
+	 * Template für die Eingabe der Produktattribute innerhalb der Produktverwaltung
+	 */
+
+?>
+<?php if (sizeof($this->view['data']['pa']) > 0) { ?>
+<div class="postbox" id="wpsg_produktattribute">		
+	<h3 class="wpsg_handlediv">
+		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
+		<span><?php echo __('Produktattribute', 'wpsg'); ?></span>
+	</h3>	
+	<div class="inside">
+	
+		<?php foreach ($this->view['data']['pa'] as $pa) { ?>			
+			<div class="wpsg_form_field">
+				<div class="wpsg_form_left">
+					<label class="wpsg_produkt_pa_label" for="produkt_pa_<?php echo $pa['id']; ?>"><?php echo __($pa['name'], 'wpsg'); ?>:</label>
+				</div>
+				<div class="wpsg_form_right">
+					<?php if ($pa['typ'] == '1') { /* RTE */ ?>
+					
+						<?php wp_editor($pa['value'], 'pa_'.$pa['id'].''); ?>
+						
+					<?php } else if ($pa['typ'] == '2') { /* Auswahl */ ?>
+						<select id="produkt_pa_<?php echo $pa['id']; ?>" name="pa_<?php echo $pa['id']; ?>">
+							<?php foreach ((array)explode("|", $pa['auswahl']) as $option) { ?>
+							<option <?php echo (($pa['value'] == $option)?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($option); ?>"><?php echo wpsg_hspc($option); ?></option>
+							<?php } ?>
+						</select>
+					<?php } else if ($pa['typ'] == '3') { /* Checkbox */ ?>
+						<input type="hidden" value="0" name="pa_<?php echo $pa['id']; ?>" />
+						<input id="produkt_pa_<?php echo $pa['id']; ?>" class="checkbox" type="checkbox" value="1" name="pa_<?php echo $pa['id']; ?>" <?php echo (($pa['value'] == '1')?'checked="checked"':''); ?> />
+					<?php } else { /* Normales Eingabefeld */ ?>
+						<input id="produkt_pa_<?php echo $pa['id']; ?>" type="text" name="pa_<?php echo $pa['id']; ?>" value="<?php echo wpsg_hspc($pa['value']); ?>" />
+					<?php } ?>
+				</div>
+			</div>
+			<div class="wpsg_clear"></div>
+		<?php } ?>
+	
+	</div>
+</div>
+<?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_produktattribute/produkt_edit_content.phtml b/views/mods/mod_produktattribute/produkt_edit_content.phtml
deleted file mode 100644
index 3d51b4c..0000000
--- a/views/mods/mod_produktattribute/produkt_edit_content.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Eingabe der Produktattribute innerhalb der Produktverwaltung
-	 */
-
-?>
-<?php if (sizeof($this->view['data']['pa']) > 0) { ?>
-<div class="postbox" id="wpsg_produktattribute">		
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Produktattribute', 'wpsg'); ?></span>
-	</h3>	
-	<div class="inside">
-	
-		<?php foreach ($this->view['data']['pa'] as $pa) { ?>			
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label for="produkt_pa_<?php echo $pa['id']; ?>"><?php echo __($pa['name'], 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right">
-					<?php if ($pa['typ'] == '1') { /* RTE */ ?>
-					
-						<?php wp_editor($pa['value'], 'pa_'.$pa['id'].''); ?>
-						
-					<?php } else if ($pa['typ'] == '2') { /* Auswahl */ ?>
-						<select id="produkt_pa_<?php echo $pa['id']; ?>" name="pa_<?php echo $pa['id']; ?>">
-							<?php foreach ((array)explode("|", $pa['auswahl']) as $option) { ?>
-							<option <?php echo (($pa['value'] == $option)?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($option); ?>"><?php echo wpsg_hspc($option); ?></option>
-							<?php } ?>
-						</select>
-					<?php } else if ($pa['typ'] == '3') { /* Checkbox */ ?>
-						<input type="hidden" value="0" name="pa_<?php echo $pa['id']; ?>" />
-						<input id="produkt_pa_<?php echo $pa['id']; ?>" class="checkbox" type="checkbox" value="1" name="pa_<?php echo $pa['id']; ?>" <?php echo (($pa['value'] == '1')?'checked="checked"':''); ?> />
-					<?php } else { /* Normales Eingabefeld */ ?>
-						<input id="produkt_pa_<?php echo $pa['id']; ?>" type="text" name="pa_<?php echo $pa['id']; ?>" value="<?php echo wpsg_hspc($pa['value']); ?>" />
-					<?php } ?>
-				</div>
-			</div>
-			<div class="wpsg_clear"></div>
-		<?php } ?>
-	
-	</div>
-</div>
-<?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_stock/produkt_edit_sidebar.phtml b/views/mods/mod_stock/produkt_edit_sidebar.phtml
index dfeb12b..b0d97bc 100644
--- a/views/mods/mod_stock/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_stock/produkt_edit_sidebar.phtml
@@ -5,29 +5,14 @@
 	 */
 
 ?>
-<div id="wpsg_stock" class="postbox">
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Lagerbestand', 'wpsg'); ?> </span>
-	</h3>
-	<div class="inside">
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<label for="wpsg_mod_stock_stock"><?php echo __('Lagerbestand', 'wpsg'); ?>:</label>
-			</div>
-			<div class="wpsg_form_right">
-				<input id="wpsg_mod_stock_stock" type="text" name="wpsg_mod_stock_stock" value="<?php echo $this->view['data']['stock']; ?>" />
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<label for="wpsg_mod_stock_stock_count"><?php echo __('Lagerbestand zählen', 'wpsg'); ?>:</label>
-			</div>
-			<div class="wpsg_form_right">
-				<input id="wpsg_mod_stock_stock_count" type="checkbox" class="checkbox" name="wpsg_mod_stock_stock_count" value="1" <?php echo (($this->view['data']['stock_count'] == '1')?'checked="checked"':''); ?> />
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>
+<div class="form-group form-group-sm">
+	<label class="col-sm-6 control-label" for="wpsg_mod_stock_stock"><?php echo __('Lagerbestand', 'wpsg'); ?>:</label>
+	<div class="col-sm-6">
+			<input id="wpsg_mod_stock_stock" type="text" name="wpsg_mod_stock_stock" value="<?php echo $this->view['data']['stock']; ?>" />
 	</div>
-</div>
\ No newline at end of file
+	<label class="col-sm-6 control-label" for="wpsg_mod_stock_stock_count"><?php echo __('Lagerbestand zählen', 'wpsg'); ?>:</label>
+	<div class="col-sm-6">		
+		<input id="wpsg_mod_stock_stock_count" type="checkbox" class="checkbox" name="wpsg_mod_stock_stock_count" value="1" <?php echo (($this->view['data']['stock_count'] == '1')?'checked="checked"':''); ?> />
+	</div>
+</div>
+
diff --git a/views/mods/mod_topseller/produkt_addedit_allgemein.phtml b/views/mods/mod_topseller/produkt_addedit_allgemein.phtml
new file mode 100644
index 0000000..58112cb
--- /dev/null
+++ b/views/mods/mod_topseller/produkt_addedit_allgemein.phtml
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Template für die Konfiguration der Topseller innerhalb der Produktverwaltung
+	 */
+
+?>
+<?php if ($this->get_option('wpsg_mod_topseller_auto') == '1') { ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_topseller[status]', __('TopSeller Status', 'wpsg'), array(
+	'0' => __('Einbeziehen', 'wpsg'),
+	'1' => __('Ausschließen', 'wpsg')
+), $this->view['wpsg_mod_topseller']['status']); ?>
+<?php } else { ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_topseller[status]', __('TopSeller Status', 'wpsg'), array(
+	'0' => __('Nicht anzeigen', 'wpsg'),
+	'1' => __('Anzeigen', 'wpsg')
+), $this->view['wpsg_mod_topseller']['status']); ?>		
+<?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_topseller/produkt_edit_allgemein.phtml b/views/mods/mod_topseller/produkt_edit_allgemein.phtml
deleted file mode 100644
index 58112cb..0000000
--- a/views/mods/mod_topseller/produkt_edit_allgemein.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Konfiguration der Topseller innerhalb der Produktverwaltung
-	 */
-
-?>
-<?php if ($this->get_option('wpsg_mod_topseller_auto') == '1') { ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_topseller[status]', __('TopSeller Status', 'wpsg'), array(
-	'0' => __('Einbeziehen', 'wpsg'),
-	'1' => __('Ausschließen', 'wpsg')
-), $this->view['wpsg_mod_topseller']['status']); ?>
-<?php } else { ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_topseller[status]', __('TopSeller Status', 'wpsg'), array(
-	'0' => __('Nicht anzeigen', 'wpsg'),
-	'1' => __('Anzeigen', 'wpsg')
-), $this->view['wpsg_mod_topseller']['status']); ?>		
-<?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_varianten/produkt_addedit_content.phtml b/views/mods/mod_varianten/produkt_addedit_content.phtml
new file mode 100644
index 0000000..bcaec6d
--- /dev/null
+++ b/views/mods/mod_varianten/produkt_addedit_content.phtml
@@ -0,0 +1,297 @@
+<?php
+
+	/**
+	 * Template für die Varianten innerhalb der Produktverwaltung
+	 */
+
+?>
+<script type="text/javascript">
+
+	<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
+	function wpsg_vp_add()
+	{
+
+		if (jQuery('#wpsg_vp_varneu').val() == '') { alert('<?php echo __('Bitte einen Namen für die neue Variante angeben!', 'wpsg'); ?>'); return; } 
+
+		var val_name = jQuery("#wpsg_vp_varneu").val();
+		var val_typ = jQuery("#wpsg_vp_vartyp").val();
+		
+		wpsg_vp_ajaxloading_show();
+		
+		jQuery.ajax( {			
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_add&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			async: false,
+			data: {				
+				name: val_name,
+				typ: val_typ
+			},
+			success: function(data) {
+				
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} );
+		
+	} // function wpsg_vp_add()
+
+	/**
+	 * Wird von dem Input Feld bei neuen Varianten aufgerufen (onkeypress) um 
+	 */
+	function wpsg_vp_add_input(ev)
+	{
+
+		if (ev && ev.which == 13)
+		{
+
+			wpsg_vp_add();
+			
+		} 
+		
+	} // function wpsg_vp_add_input(ev)
+
+	function wpsg_vp_addVariation_input(ev, k)
+	{
+
+		if (ev && ev.which == 13)
+		{
+
+			wpsg_vp_addVariation(k);
+			
+		} 
+		
+	} 
+
+	function wpsg_vp_refresh()
+	{
+
+		wpsg_vp_ajaxloading_show();
+
+		jQuery.ajax( {
+ 			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_refreh&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			success: function(data) { 
+
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide(); 
+
+			}
+		} ); 
+
+		return false;
+		
+	}
+	
+	function wpsg_vp_del(var_id)
+	{
+
+		if (!confirm("<?php echo __("Sind Sie sich sicher, dass Sie die Variante und alle Variationen löschen möchten?", "wpsg"); ?>")) return false;
+
+		wpsg_vp_ajaxloading_show();
+				
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_del&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			async: false,
+			data: {				
+				var_id: var_id
+			},
+			success: function(data) {
+				
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} ); 
+
+		return false;
+		
+	} // function wpsg_vp_del(var_id)
+
+	function wpsg_vp_deaktiv(var_id, status)
+	{
+
+		wpsg_vp_ajaxloading_show();
+		
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_deaktiv&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			async: false,
+			data: {				
+				var_id: var_id,
+				status: status
+			},
+			success: function(data) {
+				
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} ); 
+
+		return false;
+		
+	} // function wpsg_vp_deaktiv(var_id, status)
+
+	function wpsg_vp_addVariation(var_id)
+	{
+
+		var vari_name = jQuery("#variante_" + var_id).find(".variation_neu").val();
+		var vari_preis = jQuery("#variante_" + var_id).find(".variation_preis").val();
+
+		wpsg_vp_ajaxloading_show();
+
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_addVariation&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			async: false,
+			data: {				
+				var_id: var_id,
+				vari_name: vari_name,
+				vari_preis: vari_preis
+			},
+			success: function(data) {
+				 
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} ); 
+
+		return false;
+		
+	}
+
+	function wpsg_vp_vari_del(var_id, vari_id)
+	{
+
+		if (!confirm("<?php echo __("Sind Sie sich sicher, dass Sie die Variation löschen möchten?", "wpsg"); ?>")) return false;
+		
+		wpsg_vp_ajaxloading_show();
+
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_del&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			async: false,
+			data: {				
+				var_id: var_id,
+				vari_id: vari_id
+			},
+			success: function(data) {
+				 
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} ); 
+
+		return false;
+		
+	}
+
+	function wpsg_vp_vari_deaktiv(var_id, vari_id, status)
+	{
+
+		wpsg_vp_ajaxloading_show();
+		
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_deaktiv&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
+			async: false,
+			data: {				
+				var_id: var_id,
+				vari_id: vari_id,
+				status: status
+			},
+			success: function(data) {
+				 
+				jQuery("#wpsg_vp_drawVarianten").html(data);
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} ); 
+
+		return false;
+		
+	}
+	<?php } ?>
+
+	function wpsg_vp_ajaxloading_show()
+	{
+
+		jQuery('.wpsg_mod_varianten_ajaxloading').show();
+		
+	}
+
+	function wpsg_vp_ajaxloading_hide()
+	{
+
+		jQuery('.wpsg_mod_varianten_ajaxloading').hide();
+		
+	} 
+	
+	function wpsg_vp_vari_setPic(htmlElement, var_id, vari_id, pic, pic_index)
+	{
+
+		<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
+
+		wpsg_vp_ajaxloading_show();
+		
+		jQuery.ajax( {
+			url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_setPic&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>",
+			async: false,
+			data: {				
+				var_id: var_id,
+				vari_id: vari_id,
+				pic: pic
+			},
+			success: function(data) { 
+				
+				if (vari_id >= 0)
+				{
+					
+					if (jQuery(htmlElement).hasClass('mark'))
+					{
+						jQuery(htmlElement).removeClass('mark');
+					}
+					else
+					{
+						jQuery(htmlElement).addClass('mark');
+					}
+					
+				}
+				else
+				{
+					
+					if (jQuery(htmlElement).hasClass('mark'))
+					{
+						jQuery(htmlElement).removeClass('mark');
+					}
+					else
+					{
+						jQuery(htmlElement).addClass('mark');
+					}
+					
+				}
+
+				wpsg_vp_ajaxloading_hide();
+				
+			}
+		} ); 
+
+		<?php } ?>
+		
+		return false;
+		
+	}
+
+</script>
+  
+
+<div class="postbox" id="wpsg_varianten">
+	<h3 class="wpsg_handlediv">
+		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>			
+		<span><?php echo __('Varianten', 'wpsg'); ?></span>	
+	</h3>
+	<div class="inside" id="wpsg_vp_drawVarianten">
+		<?php if ($this->view['data']['id'] > 0) { ?>
+		<?php echo $this->callMod('wpsg_mod_varianten', 'drawVarianten', array(&$this->view['wpsg_mod_varianten']['data']['id'])); ?>
+		<?php } else { ?>
+		<p><?php echo __('Varianten können erst nach einmaligem Speichern des Produkts angelegt werden.', 'wpsg'); ?></p>
+		<?php } ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_varianten/produkt_edit_content.phtml b/views/mods/mod_varianten/produkt_edit_content.phtml
deleted file mode 100644
index bcaec6d..0000000
--- a/views/mods/mod_varianten/produkt_edit_content.phtml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-	/**
-	 * Template für die Varianten innerhalb der Produktverwaltung
-	 */
-
-?>
-<script type="text/javascript">
-
-	<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
-	function wpsg_vp_add()
-	{
-
-		if (jQuery('#wpsg_vp_varneu').val() == '') { alert('<?php echo __('Bitte einen Namen für die neue Variante angeben!', 'wpsg'); ?>'); return; } 
-
-		var val_name = jQuery("#wpsg_vp_varneu").val();
-		var val_typ = jQuery("#wpsg_vp_vartyp").val();
-		
-		wpsg_vp_ajaxloading_show();
-		
-		jQuery.ajax( {			
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_add&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			async: false,
-			data: {				
-				name: val_name,
-				typ: val_typ
-			},
-			success: function(data) {
-				
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} );
-		
-	} // function wpsg_vp_add()
-
-	/**
-	 * Wird von dem Input Feld bei neuen Varianten aufgerufen (onkeypress) um 
-	 */
-	function wpsg_vp_add_input(ev)
-	{
-
-		if (ev && ev.which == 13)
-		{
-
-			wpsg_vp_add();
-			
-		} 
-		
-	} // function wpsg_vp_add_input(ev)
-
-	function wpsg_vp_addVariation_input(ev, k)
-	{
-
-		if (ev && ev.which == 13)
-		{
-
-			wpsg_vp_addVariation(k);
-			
-		} 
-		
-	} 
-
-	function wpsg_vp_refresh()
-	{
-
-		wpsg_vp_ajaxloading_show();
-
-		jQuery.ajax( {
- 			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_refreh&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			success: function(data) { 
-
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide(); 
-
-			}
-		} ); 
-
-		return false;
-		
-	}
-	
-	function wpsg_vp_del(var_id)
-	{
-
-		if (!confirm("<?php echo __("Sind Sie sich sicher, dass Sie die Variante und alle Variationen löschen möchten?", "wpsg"); ?>")) return false;
-
-		wpsg_vp_ajaxloading_show();
-				
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_del&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			async: false,
-			data: {				
-				var_id: var_id
-			},
-			success: function(data) {
-				
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} ); 
-
-		return false;
-		
-	} // function wpsg_vp_del(var_id)
-
-	function wpsg_vp_deaktiv(var_id, status)
-	{
-
-		wpsg_vp_ajaxloading_show();
-		
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_deaktiv&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			async: false,
-			data: {				
-				var_id: var_id,
-				status: status
-			},
-			success: function(data) {
-				
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} ); 
-
-		return false;
-		
-	} // function wpsg_vp_deaktiv(var_id, status)
-
-	function wpsg_vp_addVariation(var_id)
-	{
-
-		var vari_name = jQuery("#variante_" + var_id).find(".variation_neu").val();
-		var vari_preis = jQuery("#variante_" + var_id).find(".variation_preis").val();
-
-		wpsg_vp_ajaxloading_show();
-
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_addVariation&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			async: false,
-			data: {				
-				var_id: var_id,
-				vari_name: vari_name,
-				vari_preis: vari_preis
-			},
-			success: function(data) {
-				 
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} ); 
-
-		return false;
-		
-	}
-
-	function wpsg_vp_vari_del(var_id, vari_id)
-	{
-
-		if (!confirm("<?php echo __("Sind Sie sich sicher, dass Sie die Variation löschen möchten?", "wpsg"); ?>")) return false;
-		
-		wpsg_vp_ajaxloading_show();
-
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_del&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			async: false,
-			data: {				
-				var_id: var_id,
-				vari_id: vari_id
-			},
-			success: function(data) {
-				 
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} ); 
-
-		return false;
-		
-	}
-
-	function wpsg_vp_vari_deaktiv(var_id, vari_id, status)
-	{
-
-		wpsg_vp_ajaxloading_show();
-		
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_deaktiv&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>',
-			async: false,
-			data: {				
-				var_id: var_id,
-				vari_id: vari_id,
-				status: status
-			},
-			success: function(data) {
-				 
-				jQuery("#wpsg_vp_drawVarianten").html(data);
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} ); 
-
-		return false;
-		
-	}
-	<?php } ?>
-
-	function wpsg_vp_ajaxloading_show()
-	{
-
-		jQuery('.wpsg_mod_varianten_ajaxloading').show();
-		
-	}
-
-	function wpsg_vp_ajaxloading_hide()
-	{
-
-		jQuery('.wpsg_mod_varianten_ajaxloading').hide();
-		
-	} 
-	
-	function wpsg_vp_vari_setPic(htmlElement, var_id, vari_id, pic, pic_index)
-	{
-
-		<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
-
-		wpsg_vp_ajaxloading_show();
-		
-		jQuery.ajax( {
-			url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_setPic&noheader=1&edit_id=<?php echo $this->view['wpsg_mod_varianten']['data']['id']; ?>",
-			async: false,
-			data: {				
-				var_id: var_id,
-				vari_id: vari_id,
-				pic: pic
-			},
-			success: function(data) { 
-				
-				if (vari_id >= 0)
-				{
-					
-					if (jQuery(htmlElement).hasClass('mark'))
-					{
-						jQuery(htmlElement).removeClass('mark');
-					}
-					else
-					{
-						jQuery(htmlElement).addClass('mark');
-					}
-					
-				}
-				else
-				{
-					
-					if (jQuery(htmlElement).hasClass('mark'))
-					{
-						jQuery(htmlElement).removeClass('mark');
-					}
-					else
-					{
-						jQuery(htmlElement).addClass('mark');
-					}
-					
-				}
-
-				wpsg_vp_ajaxloading_hide();
-				
-			}
-		} ); 
-
-		<?php } ?>
-		
-		return false;
-		
-	}
-
-</script>
-  
-
-<div class="postbox" id="wpsg_varianten">
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>			
-		<span><?php echo __('Varianten', 'wpsg'); ?></span>	
-	</h3>
-	<div class="inside" id="wpsg_vp_drawVarianten">
-		<?php if ($this->view['data']['id'] > 0) { ?>
-		<?php echo $this->callMod('wpsg_mod_varianten', 'drawVarianten', array(&$this->view['wpsg_mod_varianten']['data']['id'])); ?>
-		<?php } else { ?>
-		<p><?php echo __('Varianten können erst nach einmaligem Speichern des Produkts angelegt werden.', 'wpsg'); ?></p>
-		<?php } ?>
-	</div>
-</div>
\ No newline at end of file
-- 
cgit v1.2.3