Index: /lib/helper_functions.inc.php
===================================================================
--- /lib/helper_functions.inc.php	(revision 5689)
+++ /lib/helper_functions.inc.php	(revision 5690)
@@ -571,5 +571,5 @@
 		
 		ob_end_clean();
-		
+
 		return $TC->render(WPSG_PATH_VIEW.'admin/form/text.phtml', false);
 	
Index: /mods/wpsg_mod_ordercondition.class.php
===================================================================
--- /mods/wpsg_mod_ordercondition.class.php	(revision 5689)
+++ /mods/wpsg_mod_ordercondition.class.php	(revision 5690)
@@ -174,5 +174,5 @@
 					$this->shop->addTranslationString('wpsg_mod_ordercondition_text_'.$_REQUEST['oc_id'], $_REQUEST['value']);
 					
-					die("1");
+					die($_REQUEST['value']);
 					
 				}
@@ -188,5 +188,5 @@
 					$this->shop->addTranslationString('wpsg_mod_ordercondition_errortext_'.$_REQUEST['oc_id'], $_REQUEST['value']);
 						
-					die("1");
+					die($_REQUEST['value']);
 					
 				}
Index: /views/admin/form/text.phtml
===================================================================
--- /views/admin/form/text.phtml	(revision 5689)
+++ /views/admin/form/text.phtml	(revision 5690)
@@ -1,3 +1,3 @@
-<div class="form-group form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?> <?php echo wpsg_getStr($this->view['field_config']['class_wrap']); ?>">
+<div class="form-group form-group-text form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?> <?php echo wpsg_getStr($this->view['field_config']['class_wrap']); ?>">
 
 	<label class="col-sm-6 control-label" for=""><?php echo $this->view['field_label']; ?></label>
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 5689)
+++ /views/css/admin.css	(revision 5690)
@@ -21,5 +21,6 @@
 #wpsg-bs .table .wpsg-sm { height:20px; line-height:20px; font-size:12px; }
 #wpsg-bs .wpsg_code { background-color:#EFEFEF; border:1px solid #000000; padding:3px; margin-top:5px; margin-bottom:5px; font-family:monospace; font-size:12px; }
-#wpsg-bs .form-horizontal .editable { padding-top:0px; }
+#wpsg-bs .form-horizontal .editable { padding-top:0px; display:inline; }
+#wpsg-bs .editableform textarea { width:500px; height:250px; }
 #wpsg-bs .wpsg-glyphicon { margin-right:10px; }
 #wpsg-bs .wpsg-glyphlink-td > span { margin-left:5px; margin-top:5px; }
@@ -27,5 +28,7 @@
 #wpsg-bs .wpsg_error { color:red; }
 #wpsg-bs .form-group-sm .form-control { padding-left:8px; }
-#wpsg-bs .form-select .form-control { padding-left:5px; } 
+#wpsg-bs .form-group-text { position:relative; }
+#wpsg-bs .form-group-text p { padding-top:5px; }
+#wpsg-bs .form-select .form-control { padding-left:5px; }
 #wpsg-bs .form-group-sm .form-control-static { padding-left:10px; height:auto; }
 #wpsg-bs .list-group-head { background-color:#666666; color:#FFFFFF; border:1px solid #666666; }
@@ -189,3 +192,7 @@
 #wpsg_profil_list { padding:10px; border:1px solid #DDDDDD; }
 
+/* Modul Bestellbedingungen */
+#wpsg_oc_list .glyphicon-trash { position:absolute; right:5px; top:0px; font-size:1.4rem; }
+#wpsg_oc_list .wpsg_mod_ordercondition_text { width:100%; height:150px; }
+
 #beschreibung_ifr { height:500px; }
Index: /views/js/editable.js
===================================================================
--- /views/js/editable.js	(revision 5689)
+++ /views/js/editable.js	(revision 5690)
@@ -23,6 +23,8 @@
 				}				
 			};
-			
-			if (options.type == 'select' && typeof options.data == "string") {
+
+            if (typeof options.type == "string") opt['type'] = options.type;
+
+			if (options.type == 'string' && typeof options.data == "string") {
 				
 				var ar = [];
Index: /views/mods/mod_ordercondition/list.phtml
===================================================================
--- /views/mods/mod_ordercondition/list.phtml	(revision 5689)
+++ /views/mods/mod_ordercondition/list.phtml	(revision 5690)
@@ -9,5 +9,5 @@
 
 	jQuery(document).ready(function() {
-	
+	/*
 		jQuery('.wpsg_mod_ordercondition_edit_name').each(function() {
 	
@@ -42,6 +42,7 @@
 			
 		} );
-	
-		jQuery('#wpsg_oc_list .wpsg_icon_remove').bind('click', function() {
+	*/
+
+		jQuery('.wpsg_oc_removeLink').bind('click', function() {
 	
 			if (!confirm('<?php echo __('Sind Sie sich sicher, dass sie diese Bestellbedingung entfernen möchten?', 'wpsg'); ?>')) return false;
@@ -52,5 +53,5 @@
 				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=remove&noheader=1',
 				data: {
-					oc_id: jQuery(this).parent().attr("id")
+					oc_id: jQuery(this).attr("data-id")
 				},
 				success: function(data)
@@ -71,48 +72,80 @@
 <?php } else { ?>
 <?php $i = 0; foreach ($this->view['wpsg_mod_ordercondition']['data'] as $oc) { $i ++; ?>
-	
+
+    <hr />
+
 	<div id="wpsg_mod_ordercondition_row_<?php echo $oc['id']; ?>">
 
-		<?php echo wpsg_drawForm_Input($oc['id'], __('ID', 'wpsg'), $oc['id'], array('text' => true, 'remove' => '1')); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_mod_ordercondition_name_'.$oc['id'], __('Bezeichnung', 'wpsg'), $oc['name'], array('text' => true, 'class_text' => 'wpsg_mod_ordercondition_edit_name wpsg_editable')); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_ordercondition_typ_'.$oc['id'], __('Wirkungsbereich', 'wpsg'), array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg')), $oc['typ'], array('class_select' => 'wpsg_editable wpsg_mod_ordercondition_edit_typ')); ?>
-		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<label for="wpsg_mod_ordercondition_text_<?php echo $oc['id']; ?>"><?php echo __('Bedingungstext', 'wpsg'); ?>:</label>
-			</div>
-			<div class="wpsg_form_right">
-				<p>
-					<a href="#" onclick="return wpsg_showOCText(<?php echo $oc['id']; ?>);"><?php echo __('Editor anzeigen/verbergen', 'wpsg'); ?></a>
-				</p>
-			</div>
-		</div>
-		<div class="wpsg_clear"></div>
-				
-		<div class="wpsg_form_field wpsg_mod_ordercondition_editor wpsg_mod_ordercondition_editor_<?php echo $oc['id']; ?>" style="display:none; width:745px; min-height:225px;">	
-			<textarea class="wpsg_mod_ordercondition_text" id="oc_<?php echo $oc['id']; ?>" name="oc[<?php echo $oc['id']; ?>]"><?php echo wpsg_hspc($oc['text']); ?></textarea>
-			<div class="wpsg_clear"></div><br />
-			<input class="button" type="button" onclick="wpsg_saveOCText(<?php echo $oc['id']; ?>);" value="<?php echo __('Text speichern', 'wpsg'); ?>" /><br /><br />
-		</div>
-	
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<label for="wpsg_mod_ordercondition_errortext_<?php echo $oc['id']; ?>"><?php echo __('Fehlertext', 'wpsg'); ?>:</label>
-			</div>
-			<div class="wpsg_form_right">
-				<p>
-					<a href="#" onclick="return wpsg_showOCErrorText(<?php echo $oc['id']; ?>);"><?php echo __('Editor anzeigen/verbergen', 'wpsg'); ?></a>
-				</p>
-			</div>
-		</div>
-		<div class="wpsg_clear"></div>
-				
-		<div class="wpsg_form_field wpsg_mod_ordercondition_editor wpsg_mod_ordercondition_editor_errortext_<?php echo $oc['id']; ?>" style="display:none; width:745px; min-height:225px;">	
-			<textarea class="wpsg_mod_ordercondition_text" id="oc_errortext_<?php echo $oc['id']; ?>" name="oc[<?php echo $oc['id']; ?>]"><?php echo wpsg_hspc($oc['errortext']); ?></textarea>
-			<div class="wpsg_clear"></div><br />
-			<input class="button" type="button" onclick="wpsg_saveOCErrorText(<?php echo $oc['id']; ?>);" value="<?php echo __('Text speichern', 'wpsg'); ?>" /><br />
-		</div>		
-	
-		<?php if ($i < sizeof($this->view['wpsg_mod_ordercondition']['data'])) { ?><br /><hr /><?php } ?>
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <?php echo $oc['id']; ?><a data-id="<?php echo $oc['id']; ?>" class="wpsg_oc_removeLink" href="#"><span class="wpsg-glyphicon glyphicon glyphicon-trash"></span></a>
+        <?php echo wpsg_drawForm_TextEnd(__('ID', 'wpsg')); ?>
+
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <span id="oc_name_<?php echo $oc['id']; ?>"><?php echo $oc['name']; ?></span>
+        <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
+        <script type="text/javascript">/* <![CDATA[ */
+
+            jQuery('#oc_name_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+                submitdata: {
+                    field: 'name',
+                    oc_id: '<?php echo $oc['id']; ?>'
+                }
+            });
+
+        /* ]]> */</script>
+
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <span id="oc_typ_<?php echo $oc['id']; ?>"><?php
+
+            if ($oc['typ'] == '1') echo __('Jede Bestellung', 'wpsg');
+            else if ($oc['typ'] == '2') echo __('Bestimmte Produkte', 'wpsg');
+            else echo __('Inaktiv', 'wpsg');
+
+        ?></span>
+        <?php echo wpsg_drawForm_TextEnd(__('Wirkungsbereich', 'wpsg')); ?>
+        <script type="text/javascript">/* <![CDATA[ */
+
+            jQuery('#oc_typ_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+                type: 'string',
+                data: '<?php echo json_encode(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'))); ?>',
+                submitdata: {
+                    field: 'typ',
+                    oc_id: '<?php echo $oc['id']; ?>'
+                }
+            });
+
+        /* ]]> */</script>
+    
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <span class="wpsg_editable" id="oc_text_<?php echo $oc['id']; ?>"><?php echo wpsg_hspc($oc['text']); ?></span>
+        <?php echo wpsg_drawForm_TextEnd(__('Bedinungstext', 'wpsg')); ?>
+        <script type="text/javascript">/* <![CDATA[ */
+
+            jQuery('#oc_text_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+                submitdata: {
+                    field: 'text',
+                    oc_id: '<?php echo $oc['id']; ?>'
+                },
+                type: 'textarea'
+            });
+
+        /* ]]> */</script>
+
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <span class="wpsg_editable" id="oc_errortext_<?php echo $oc['id']; ?>"><?php echo wpsg_hspc($oc['errortext']); ?></span>
+        <?php echo wpsg_drawForm_TextEnd(__('Fehlertext', 'wpsg')); ?>
+        <script type="text/javascript">/* <![CDATA[ */
+
+            jQuery('#oc_errortext_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+                submitdata: {
+                    field: 'errortext',
+                    oc_id: '<?php echo $oc['id']; ?>'
+                },
+                type: 'textarea'
+            });
+
+        /* ]]> */</script>
+
+		<?php if ($i == sizeof($this->view['wpsg_mod_ordercondition']['data'])) { ?><hr /><?php } ?>
 	
 	</div>
Index: /views/mods/mod_ordercondition/settings_edit.phtml
===================================================================
--- /views/mods/mod_ordercondition/settings_edit.phtml	(revision 5689)
+++ /views/mods/mod_ordercondition/settings_edit.phtml	(revision 5690)
@@ -151,18 +151,8 @@
 <?php } ?>
 
-<div class="wpsg_admin_box">		
-		  		
-	<div class="head">
-		<div class="title">
-			<div class="fulltab">
-				<?php echo __('Bestellbedingungen', 'wpsg'); ?>
-				<a title="<?php echo __('Neue Bestellbedingung anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addOC();"></a>
-			</div>
-		</div>
-	</div>
-			
-	<div class="content" id="wpsg_oc_list">
-		<?php echo $this->callMod('wpsg_mod_ordercondition', 'oc_list'); ?>
-	</div>
-					
+<div id="wpsg_oc_list">
+	<?php echo $this->callMod('wpsg_mod_ordercondition', 'oc_list'); ?>
 </div>
+
+<br />
+<a href="#" onclick="return wpsg_addOC();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neue Bestellbedingung anlegen', 'wpsg'); ?></a>