From b86cb23caa3e47091cb04b8c74e8630ff233cc2a Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Sat, 24 Sep 2016 12:57:13 +0000
Subject: - Backend Rabatt schön
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5792 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/checkbox.phtml | 18 ++++++++++++------
 views/admin/form/input.phtml    |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'views/admin/form')

diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index 6abc56c..fcf63e6 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -1,11 +1,17 @@
 <div class="form-group form-group-sm form-checkbox <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">
 
-	<div class="<?php 
-	
-		if (wpsg_isTrue($this->view['field_config']['fullWidth'])) echo 'col-sm-12';
-		else echo 'col-sm-offset-6 col-sm-6';
-		
-	?>">
+    <?php if (wpsg_isSizedString($this->view['field_config']['label'])) { $value_class = 'col-sm-6'; ?>
+    <label class="col-sm-6 control-label">
+        <?php echo wpsg_hspc($this->view['field_config']['label']); ?>
+    </label>
+    <?php } else {
+
+        if (wpsg_isTrue($this->view['field_config']['fullWidth'])) $value_class = 'col-sm-12';
+		else $value_class = 'col-sm-offset-6 col-sm-6';
+
+    } ?>
+
+	<div class="<?php echo $value_class; ?>">
 		
 		<div class="checkbox">
 			<label>
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 2af7457..82ea89e 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -47,7 +47,7 @@
 
         jQuery(document).ready(function() {
 
-            jQuery('#<?php echo $this->view['field_id']; ?>').datepicker();
+            jQuery('#<?php echo $this->view['field_id']; ?>').datepicker( { dateFormat: 'dd.mm.yy' } );
 
         } );
 
-- 
cgit v1.2.3