From f59c23ed800fdd0ec0dcadcff8e87e5e74e98cac Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 18 May 2016 17:30:03 +0000
Subject: - Aufgeräumt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5490 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/admin.css                             |  2 +-
 views/mods/mod_productvariants/admin_edit.phtml | 13 ++++++-------
 views/mods/mod_stock/produkt_edit_sidebar.phtml | 12 ++----------
 3 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'views')

diff --git a/views/css/admin.css b/views/css/admin.css
index 3779d03..99600af 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -139,7 +139,7 @@
 .wpsg_mod_productvariants_table_variation .col_id { width:50px; }
 .wpsg_mod_productvariants_table_variation .col_active { width:25px; }
 .wpsg_mod_productvariants_info { font-style:italic; font-size:0.9em; }
-.wpsg_mod_productvariants_dialog_noDialog { border:1px solid #DDDDDD; padding:5px; margin:-5px; margin-top:15px; margin-bottom:15px; }
+.wpsg_mod_productvariants_dialog_noDialog { border:1px solid #DDDDDD; padding:10px; margin:-5px; margin-top:15px; margin-bottom:15px; }
 .wpsg_mod_productvariants_dialog_noDialog .modal-body { padding:1rem 0px; }
 .wpsg_mod_productvariants_dialog_noDialog .modal-footer { padding:1rem 0px; }
 
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index 4896638..ef11894 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -15,18 +15,18 @@
     	<thead>
       		<tr>
       		
-      			<?php if (wpsg_isSizedInt($this->view['product_id'])) { ?>
+      			<?php $colspan = 1; if (wpsg_isSizedInt($this->view['product_id'])) { $colspan ++; ?>
       			<th class="col_active"></th>
       			<?php } ?>
       		
       			<th class="col_id"><?php echo __('Id', 'wpsg'); ?></th>
         		<th class="col1"><?php echo __('Name', 'wpsg'); ?></th> 
         		
-        		<?php if (wpsg_isSizedInt($this->view['product_id'])) { ?>
+        		<?php if (wpsg_isSizedInt($this->view['product_id'])) { $colspan += 3; ?>
         		<th class="col_artnr"><?php echo __('Artikelnummer', 'wpsg'); ?></th>
         		<th class="col_price"><?php echo __('Preis', 'wpsg'); ?></th>
         		<th class="col_stock"><?php echo __('Lagerbestand', 'wpsg'); ?></th>
-        		<?php } else { ?>
+        		<?php } else { $colspan ++; ?>
         		<th class="col_action"></th>
         		<?php } ?>
         		
@@ -114,15 +114,14 @@
     			<?php } ?>			
     			
     		</tr>
-    		
-    		<?php /* ?>
+    		 
     		<tr>
     			<td class="col_id">&nbsp;</td>
-    			<td class="col_image" colspan="5">
+    			<td class="col_image" colspan="<?php echo $colspan; ?>">
     				TODO: Bilder
     			</td>
     		</tr>
-    		*/ ?>
+
     	</tbody>
     	<?php } ?>    	
     	    	
diff --git a/views/mods/mod_stock/produkt_edit_sidebar.phtml b/views/mods/mod_stock/produkt_edit_sidebar.phtml
index b0d97bc..d9ad1cb 100644
--- a/views/mods/mod_stock/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_stock/produkt_edit_sidebar.phtml
@@ -5,14 +5,6 @@
 	 */
 
 ?>
-<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>
-	<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>
 
+<?php echo wpsg_drawForm_Input('wpsg_mod_stock_stock', __('Lagerbestand', 'wpsg'), wpsg_getStr($this->view['data']['stock'], '0')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_stock_count', __('Lagerbestand zählen', 'wpsg'), wpsg_getStr($this->view['data']['stock_count'], '0')); ?>
-- 
cgit v1.2.3