From 4f057b8338f86a278e03783873ad13bda37dc749 Mon Sep 17 00:00:00 2001 From: Nedim Uka Date: Tue, 4 Dec 2018 10:24:50 +0100 Subject: [PATCH] Extra commision column now split into 3 , and tooltip added --- backend/app/plugins/wiaas/assets/css/menu.css | 119 ++++++++++++++++++ .../assets/js/wiaas-admin-cl-packages.js | 10 ++ .../class-wiaas-admin-cl-packages.php | 1 + .../admin-cl/views/html-cl-package-prices.php | 95 +++++++------- .../includes/admin/class-wiaas-admin-cl.php | 1 + 5 files changed, 184 insertions(+), 42 deletions(-) diff --git a/backend/app/plugins/wiaas/assets/css/menu.css b/backend/app/plugins/wiaas/assets/css/menu.css index da83ba0..b0c4890 100644 --- a/backend/app/plugins/wiaas/assets/css/menu.css +++ b/backend/app/plugins/wiaas/assets/css/menu.css @@ -62,3 +62,122 @@ .gravityflow-dicussion-item-value { padding: 10px; } + +.woocommerce-help-tip{ + color:#666; + display:inline-block; + font-size:1.1em; + font-style:normal; + height:16px; + line-height:16px; + position:relative; + vertical-align:middle; + width:16px} + +.woocommerce-help-tip::after{ + font-family:Dashicons; + speak:none; + font-weight:400; + font-variant:normal; + text-transform:none; + line-height:1; + -webkit-font-smoothing:antialiased; + margin:0; + text-indent:0; + position:absolute; + top:0; + left:0; + width:100%; + height:100%; + text-align:center; + content:""; + cursor:help +} + +h2 .woocommerce-help-tip{ + margin-top:-5px; + margin-left:.25em +} + +/** + * Tooltips + */ +.tips { + cursor: help; + text-decoration: none; +} + +img.tips { + padding: 5px 0 0; +} + +#tiptip_holder { + display: none; + z-index: 8675309; + position: absolute; + top: 0; + /*rtl:ignore*/ + left: 0; +} +#tiptip_holder.tip_top { + padding-bottom: 5px; +} +#tiptip_holder.tip_top #tiptip_arrow_inner { + margin-top: -7px; + margin-left: -6px; + border-top-color: #333; +} +#tiptip_holder.tip_bottom { + padding-top: 5px; +} +#tiptip_holder.tip_bottom #tiptip_arrow_inner { + margin-top: -5px; + margin-left: -6px; + border-bottom-color: #333; +} +#tiptip_holder.tip_right { + padding-left: 5px; +} +#tiptip_holder.tip_right #tiptip_arrow_inner { + margin-top: -6px; + margin-left: -5px; + border-right-color: #333; +} +#tiptip_holder.tip_left { + padding-right: 5px; +} +#tiptip_holder.tip_left #tiptip_arrow_inner { + margin-top: -6px; + margin-left: -7px; + border-left-color: #333; +} + +#tiptip_content, +.chart-tooltip, +.wc_error_tip { + color: #fff; + font-size: 0.8em; + max-width: 150px; + background: #333; + text-align: center; + border-radius: 3px; + padding: 0.618em 1em; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); +} +#tiptip_content code, +.chart-tooltip code, +.wc_error_tip code { + padding: 1px; + background: #888; +} + +#tiptip_arrow, +#tiptip_arrow_inner { + position: absolute; + border-color: transparent; + border-style: solid; + border-width: 6px; + height: 0; + width: 0; +} + diff --git a/backend/app/plugins/wiaas/assets/js/wiaas-admin-cl-packages.js b/backend/app/plugins/wiaas/assets/js/wiaas-admin-cl-packages.js index 55332cb..5743a71 100644 --- a/backend/app/plugins/wiaas/assets/js/wiaas-admin-cl-packages.js +++ b/backend/app/plugins/wiaas/assets/js/wiaas-admin-cl-packages.js @@ -1,5 +1,15 @@ jQuery(document).ready(function ($) { + $( document.body ).on( 'init_tooltips', function() { + $( '.woocommerce-help-tip' ).tipTip( { + 'attribute': 'data-tip', + 'fadeIn': 50, + 'fadeOut': 50, + 'delay': 200, + 'defaultPosition': 'top' + } ); + } ).trigger( 'init_tooltips' ); + $('#tabs').each(function() { var disabled = $( this ).data('disabled') || ''; diff --git a/backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-packages.php b/backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-packages.php index ec50c23..c1e7b79 100644 --- a/backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-packages.php +++ b/backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-packages.php @@ -40,6 +40,7 @@ class Wiaas_Admin_CL_Packages { $plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) ); wp_enqueue_style( 'wiaas_admin_menu', $plugin_url . '/assets/css/menu.css' ); + } public static function add_cl_packages_menu() { diff --git a/backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-prices.php b/backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-prices.php index cb3220f..e5412ba 100644 --- a/backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-prices.php +++ b/backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-prices.php @@ -20,7 +20,9 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default'; ?> - + + + - -
- - -
- 0) { - ?> -
- - +
+ + - -
- -
- - - -
+ data-target="wiaas_cl_fixed_extra_" + data-type="fixed" + name="cl_extras[][fixed]" + value="" + type="text" + > +
+ + + + + + +
+ + +
+ + + + 0) { + ?> +
+ + + +
+ +
= diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-cl.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-cl.php index 94f723f..70c7ef8 100644 --- a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-cl.php +++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-cl.php @@ -37,6 +37,7 @@ class Wiaas_Admin_CL { $plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) ); wp_enqueue_script( 'wiaas_admin_cl_packages', $plugin_url . '/assets/js/wiaas-admin-cl-packages.js' ); + wp_enqueue_script('jquery-tiptip'); wp_enqueue_style( 'wiaas_admin_cl', $plugin_url . '/assets/css/wiaas-admin-cl.css' ); }