From c14a7c20ec8c489a37412cebb524e367679f5a60 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 22 Mar 2016 06:59:01 +0000
Subject: - Switch

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5436 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/input.phtml                 | 11 ++++--
 views/admin/index.phtml                      | 50 +++++++++++++++++++++++++++-
 views/css/admin.css                          | 11 ++++--
 views/css/frontend.css                       |  3 +-
 views/mods/mod_productview/productview.phtml | 25 +++++++++++---
 5 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 4c68a73..1235fc7 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -3,10 +3,15 @@
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
-		<input type="text" class="form-control input-sm" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />		
-	</div>
 	
-	<a href="#" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+		<div class="wpsg_field_wrap">
+			<input type="text" class="form-control input-sm" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />
+			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+			<?php } ?>
+		</div>
+				
+	</div>
 	
 	<div class="clearfix wpsg_clear"></div>
 	
diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index c6f7b0a..0b7e1aa 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -46,4 +46,52 @@
 		<?php } ?>
 	</div>
 	
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		jQuery('*[data-wpsg-tip]').bind('click', function() { 
+
+			jQuery(this).unbind('click');
+
+			var po = this;
+			
+			jQuery(this).popover( {
+				'html': true,
+				'content': function(el) {
+
+					if (this.cache) return this.cache
+					 
+					jQuery.ajax( {
+						url: '?page=wpsg-Admin&subaction=loadHelp&noheader=1',
+						data: {
+							field: jQuery(this).attr('data-wpsg-tip')
+						},
+						success: function(data) {
+
+							var popover = jQuery(po).attr('data-content', data).data('popover');
+							jQuery(po).data('bs.popover').options.content = data;
+							
+							//popover.setContent();
+							
+							//jQuery('#wpsg-popover-content').html(data);
+							//jQuery(po).setContent();
+							
+						}
+					} );
+					
+					return this.cache = '<div id="wpsg-popover-content"><img src="' + wpsg_ajax.img_ajaxloading + '" alt="' + wpsg_ajax.label_pleasewait + '" /></div>';
+										
+				},
+				'trigger': 'focus'
+			} ).popover('show');
+ 
+			return false;
+			
+		} );
+		
+	} );
+
+/* ]]> */</script>
\ No newline at end of file
diff --git a/views/css/admin.css b/views/css/admin.css
index f011238..34be929 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -12,9 +12,14 @@
 #wpsg-bs .pagination { margin-top:0px; margin-bottom:10px; }
 #wpsg-bs .content { width:100%; box-sizing:border-box; padding-right:20px; }
 #wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; }
-#wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; }
-#wpsg-bs .has-feedback label ~ .form-control-feedback { top:-1px; }
-#wpsg-bs .has-feedback input[type="text"] { margin-right:20px; }
+#wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; } 
+#wpsg-bs .arrow { margin-left:0px !important; }
+
+/* Formulare NEU */
+#wpsg-bs .wpsg_field_wrap { width:100%; position:relative; padding-right:25px; }
+#wpsg-bs .wpsg_field_wrap .form-control-feedback { right:0px; width:20px; cursor:pointer; pointer-events:all; }
+#wpsg-bs .wpsg_field_wrap .form-control-feedback:focus,
+#wpsg-bs .wpsg_field_wrap .form-control-feedback:hover { text-decoration:none; }
 
 /* Bootstrap Formulare im alten Teil */
 .wpsg_old_forms .form-group { margin-left:-15px; margin-right:-15px; margin-bottom:5px; } 
diff --git a/views/css/frontend.css b/views/css/frontend.css
index 2fa2d1f..a5752a4 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -324,6 +324,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_mod_productview-order { font-size:14px; color:#9B9B9B; }
 .wpsg_mod_productview-order .glyphicon { margin-left:10px; margin-right:5px; }
 .wpsg_mod_productview-order strong { color:#29556E; font-weight:bold; }
+.wpsg_mod_productview_image  { position:relative; }
 .wpsg_mod_productview_image img { max-width:100%; height:auto; border:1px solid #E4F3F8; }
 .wpsg_productview_pager { width:100%; border-top:1px solid #E4F3F8; border-bottom:1px solid #E4F3F8; margin-bottom:25px; margin-top:10px; padding-top:25px; padding-bottom:25px; text-align:center; }
 .wpsg_productview_pager .wpsg_productview_pager_wrap { display:inline-block; margin:auto; }
@@ -337,7 +338,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_productview_product .wpsg_mod_productview_price_wrap .wpsg_mod_productview_oldprice { text-decoration: line-through; } 
 .wpsg_productview_product .wpsg_mod_productview_price_wrap .wpsg_mod_productview_pricehiglight { color:#FF0000; }
 .wpsg_productview_product .wpsg_mod_productview_go { display:none; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); text-align:center; }
-.wpsg_productview_product .wpsg_mod_productview_go > span { width:50px; height:50px; position:absolute; left:50%; margin-left:-25px; top:50%; margin-top:-25px; font-size:50px; color:#FFFFFF; }
+.wpsg_productview_product .wpsg_mod_productview_go > .wpsg_star_wrap { font-size:22px; color:#0F303F; width:80%; position:absolute; left:50%; margin-left:-40%; top:10%; }
 .wpsg_productview_product:hover { text-decoration:none; }
 .wpsg_productview_product:hover .wpsg_mod_productview_go { display:block; }
 .wpsg_mod_productview_loading { width:100%; height:100%; background-color:rgba(255, 255, 255, 0.5); position:absolute; left:0px; top:0px; }
diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml
index 10f7cf2..7b0e591 100644
--- a/views/mods/mod_productview/productview.phtml
+++ b/views/mods/mod_productview/productview.phtml
@@ -35,13 +35,32 @@
 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>
 		
 			<?php $i = 0; foreach ($this->view['wpsg_mod_productview']['products'] as $oProduct) { $i ++; ?>
-			<a title="<?php echo wpsg_translate(__('Zum Produkt "#1#"', 'wpsg'), $oProduct->getProductName()); ?>" href="<?php echo $oProduct->getProductURL(); ?>" class="wpsg_productview_product wpsg_productview_product_<?php echo $oProduct->id; ?> col-lg-3">
+			<a title="<?php echo wpsg_hspc(wpsg_translate(__('Zum Produkt "#1#"', 'wpsg'), $oProduct->getProductName())); ?>" href="<?php echo $oProduct->getProductURL(); ?>" class="wpsg_productview_product wpsg_productview_product_<?php echo $oProduct->id; ?> col-lg-3">
 				
 				<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>
 				<?php $image_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?>
 				<?php if (wpsg_isSizedString($image_url)) { ?>
 				<div class="wpsg_mod_productview_image">
+				
 					<img src="<?php echo $image_url; ?>" alt="" />
+					
+					<div class="wpsg_mod_productview_go">
+						<div class="wpsg_star_wrap">
+							<?php $star = rand(0, 5); ?>  
+							<?php for ($i = 0; $i <= 5; $i ++) { ?><i class="fa fa-star-o"></i><?php } ?>
+						</div>		
+						<div class="wpsg_center">
+							<div class="wpsg_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>
+							
+							<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>
+							<?php // echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+							<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
+							
+							<?php } ?>
+							
+						</div>									
+					</div>
+					
 				</div>
 				<?php } } ?>
 				
@@ -69,9 +88,7 @@
 				</div>
 				
 				<input type="hidden" name="wpsg_atts" value="<?php echo @wpsg_hspc(serialize($this->view['wpsg_mod_productview']['atts'])); ?>" />
-				
-				<div class="wpsg_mod_productview_go"><span class="glyphicon glyphicon-eye-open"></span></div>
-				
+								
 			</a>
 			
 			<?php if ($i % 4 === 0) { ?>
-- 
cgit v1.2.3