diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/admin/form/text.phtml | 1 | ||||
| -rw-r--r-- | views/admin/konfiguration.phtml | 3 | ||||
| -rw-r--r-- | views/js/admin.js | 32 |
3 files changed, 31 insertions, 5 deletions
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index 50fd204..94011be 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -14,6 +14,7 @@ <?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-question-sign form-control-feedback" aria-hidden="true"></a>
<?php } ?>
+
</div>
</div>
diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index 518d2a7..16d991f 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -38,8 +38,7 @@ <?php } else { ?>
<?php wpsg_drawForm_TextStart(); ?>
<?php echo WPSG_VERSION; ?> <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=allgemein&do=update&submit=1&noheader=1"><?php echo __("Aktualisieren", "wpsg"); ?></a>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_glyphicon_right glyphicon glyphicon-question-sign"></a>
- <?php echo wpsg_drawForm_TextEnd(__('Installierte DB Version', 'wpsg')); ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Installierte DB Version', 'wpsg'), array('help' => 'DBUpdate')); ?>
<?php } ?>
<?php echo wpsg_drawForm_Input('wpsg_currency', __('Währung', 'wpsg'), $this->get_option('wpsg_currency'), array('help' => 'Einstellungen_Allgemein_Waehrung')); ?>
diff --git a/views/js/admin.js b/views/js/admin.js index c0143ce..fa32ba8 100644 --- a/views/js/admin.js +++ b/views/js/admin.js @@ -147,16 +147,34 @@ function wpsg_in_array(needle, haystack) }
+ var po;
+
function wpsg_ajaxBind()
{
// Hilfe Tooltips
jQuery('*[data-wpsg-tip]').on('click', function() {
- jQuery(this).off('click').on('click', function() { return false; } );
+ //jQuery(this).off('click').on('click', function() { return false; } );
- var po = this;
-
+ if (typeof po === "object")
+ {
+
+ if (po != this) jQuery(po).popover('hide');
+
+ }
+
+ po = this;
+
+ if (jQuery(this).hasClass('activated'))
+ {
+
+ jQuery(this).popover('show');
+
+ return false;
+
+ }
+
jQuery(this).popover( {
'html': true,
'content': '<div id="wpsg-popover-content"><img src="' + wpsg_ajax.img_ajaxloading + '" alt="' + wpsg_ajax.label_pleasewait + '" /></div>',
@@ -180,6 +198,8 @@ function wpsg_in_array(needle, haystack) }
} );
+ jQuery(this).addClass('activated');
+
return false;
} );
@@ -202,6 +222,12 @@ function wpsg_in_array(needle, haystack) return false;
} );
+
+ jQuery("html,body").on("click touchstart", function() {
+
+ if (typeof po === "object") jQuery(po).popover('hide');
+
+ });
jQuery('.wpsg_showhide_filter').bind('click', function() {
|