From 54390eecd0f8e80d133bd77698cede072dbdd681 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 6 Jan 2017 15:24:56 +0000
Subject: Änderungen und Fehlerkorrekturen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6005 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/checkbox.phtml | 9 ++++++++-
 views/admin/form/input.phtml    | 4 ++--
 views/admin/form/link.phtml     | 2 +-
 views/admin/form/select.phtml   | 2 +-
 views/admin/form/text.phtml     | 2 +-
 views/admin/form/textarea.phtml | 2 +-
 views/admin/form/upload.phtml   | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'views/admin/form')

diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index b1f7bda..8a574f2 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -27,12 +27,19 @@
 					<?php echo $this->view['field_label']; ?>
 					
 					<?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 if (wpsg_isTrue($this->view['field_config']['rAlign'])) { ?>
+							<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 wpsg_glyphicon_right glyphicon-question-sign form-control-feedback" aria-hidden="true" style="float:right;"></a>
+						<?php } else { ?>
+							<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-question-sign form-control-feedback" aria-hidden="true"></a>
+						<?php } ?>
 					<?php } ?>
 					
 				</div>
 				
 			</label>
+			
 		</div>
 		
 	</div>
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 9a5865c..76560da 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -38,10 +38,10 @@
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
 				<?php if (wpsg_isTrue($this->view['field_config']['rAlign'])) { ?>
 					<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" style="text-align:right;"></a>
+					class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true" style="float:right;"></a>
 				<?php } else { ?>
 					<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>
+					class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 				<?php } ?>
 			<?php } ?>
 		</div>
diff --git a/views/admin/form/link.phtml b/views/admin/form/link.phtml
index 711d1e9..f831506 100644
--- a/views/admin/form/link.phtml
+++ b/views/admin/form/link.phtml
@@ -31,7 +31,7 @@
 				><?php echo $this->view['field_link']; ?></a>
 
 			<?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>
+				<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-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
 				
diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
index 89a811e..396baa5 100644
--- a/views/admin/form/select.phtml
+++ b/views/admin/form/select.phtml
@@ -80,7 +80,7 @@
 			</select>
 			
 			<?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>
+				<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-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 			
 			<?php if (wpsg_isSizedString($this->view['field_config']['icon'])) { ?>
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml
index cd52dde..50fd204 100644
--- a/views/admin/form/text.phtml
+++ b/views/admin/form/text.phtml
@@ -12,7 +12,7 @@
             <?php } ?>
 				
 			<?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>
+				<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-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
 	</div>
diff --git a/views/admin/form/textarea.phtml b/views/admin/form/textarea.phtml
index d016766..87c85df 100644
--- a/views/admin/form/textarea.phtml
+++ b/views/admin/form/textarea.phtml
@@ -15,7 +15,7 @@
 			<textarea class="form-control" id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>"><?php echo wpsg_hspc($this->view['field_value']); ?></textarea>
 			
 			<?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>
+				<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-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
 				
diff --git a/views/admin/form/upload.phtml b/views/admin/form/upload.phtml
index 8e3c47e..79ef440 100644
--- a/views/admin/form/upload.phtml
+++ b/views/admin/form/upload.phtml
@@ -22,7 +22,7 @@
 				<?php } ?>
 				/>
 			<?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>
+				<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-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
 				
-- 
cgit v1.2.3