From 4a487b126e70cc0a42dbf340d3dd7e0bc217a980 Mon Sep 17 00:00:00 2001 From: mmth Date: Mon, 3 Dec 2018 04:24:39 +0500 Subject: [PATCH 1/6] fix regExp for phone mask MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit В текущем варианте при включенной маске, данные не проходили проверку, т.к. отсутствовал допуск на скобки --- mod_simplecallback/mod_simplecallback.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_simplecallback/mod_simplecallback.xml b/mod_simplecallback/mod_simplecallback.xml index 707e5f8..69e7c0d 100644 --- a/mod_simplecallback/mod_simplecallback.xml +++ b/mod_simplecallback/mod_simplecallback.xml @@ -101,7 +101,7 @@ name="simplecallback_phone_field_pattern" label="Паттерн проверки (RegExp)" description="" - default="(\+?\d[- .]*){6,14}"> + default="(\+?\d[- .()]*){6,14}"> Date: Mon, 3 Dec 2018 23:00:52 +0500 Subject: [PATCH 2/6] small screen, close overlay Overlay form. Fix width on small screen. Close overlay bg click. --- .../mod_simplecallback/css/simplecallback.css | 27 +++++++++++++++++++ .../mod_simplecallback/js/simplecallback.js | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css b/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css index 9ef9367..660043a 100644 --- a/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css +++ b/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css @@ -177,4 +177,31 @@ input#customFile { } .simplecallback label { width: 100%; +} + +.simplecallback-overlayed input, +.simplecallback-overlayed textarea, +.simplecallback-overlayed .form-cols:not(:last-child), +.simplecallback-overlayed .custom-select{ + margin-bottom: 10px; +} +@media only screen and (max-width: 992px){ + .simplecallback-overlayed { + width: 90%; + margin-left: -45%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .simplecallback-close{ + right: 0; + top: 0; + width: 40px; + height: 40px; + } +} +@media only screen and (max-width: 320px){ + .simplecallback-overlayed{ + padding: 20px; + } } \ No newline at end of file diff --git a/mod_simplecallback/media/mod_simplecallback/js/simplecallback.js b/mod_simplecallback/media/mod_simplecallback/js/simplecallback.js index 8c1d112..cb3364f 100644 --- a/mod_simplecallback/media/mod_simplecallback/js/simplecallback.js +++ b/mod_simplecallback/media/mod_simplecallback/js/simplecallback.js @@ -277,7 +277,7 @@ }); if ($('[data-simplecallback-form-overlayed]').length > 0) { - var overlay = $('
'); + var overlay = $('
'); $('body').prepend(overlay); } From b769f57effe599454d72b5b33582614877a2ed8b Mon Sep 17 00:00:00 2001 From: mmth Date: Mon, 3 Dec 2018 23:08:45 +0500 Subject: [PATCH 3/6] Close btn --- .../media/mod_simplecallback/css/simplecallback.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css b/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css index 660043a..6f0712e 100644 --- a/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css +++ b/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css @@ -89,6 +89,7 @@ input#customFile { position: absolute; right: 10px; top: 10px; + text-align: center; } .simplecallback-close:hover { @@ -198,6 +199,7 @@ input#customFile { top: 0; width: 40px; height: 40px; + line-height: 40px; } } @media only screen and (max-width: 320px){ From d2ef3059482573ee9be7e8e8314348eff1ba0fe5 Mon Sep 17 00:00:00 2001 From: mmth Date: Tue, 4 Dec 2018 03:15:27 +0500 Subject: [PATCH 4/6] text before&after, title --- mod_simplecallback/mod_simplecallback.xml | 10 + mod_simplecallback/tmpl/default-uikit.php | 331 ++++++++++++++++++++++ mod_simplecallback/tmpl/default.php | 67 ++--- 3 files changed, 371 insertions(+), 37 deletions(-) create mode 100644 mod_simplecallback/tmpl/default-uikit.php diff --git a/mod_simplecallback/mod_simplecallback.xml b/mod_simplecallback/mod_simplecallback.xml index 69e7c0d..f417be9 100644 --- a/mod_simplecallback/mod_simplecallback.xml +++ b/mod_simplecallback/mod_simplecallback.xml @@ -455,6 +455,16 @@ + + + +
diff --git a/mod_simplecallback/tmpl/default-uikit.php b/mod_simplecallback/tmpl/default-uikit.php new file mode 100644 index 0000000..ad2666a --- /dev/null +++ b/mod_simplecallback/tmpl/default-uikit.php @@ -0,0 +1,331 @@ +getMenu()->getActive()->id; +$document = JFactory::getDocument(); +$simplecallback_jq_enabled = $params->get('simplecallback_jq_enabled', 0); + +if ($simplecallback_jq_enabled == 1) { + $document->addScript(JUri::base() . 'media/jui/js/jquery.min.js'); + $document->addScript(JUri::base() . 'media/jui/js/jquery-noconflict.js'); +} + +$js_body = $params->get('simplecallback_js_body', 0); + +if (!defined('SIMPLECALLBACK') || $js_body == 0) { + + $document->addStyleSheet(JUri::base() . 'media/mod_simplecallback/css/simplecallback.css'); + $document->addScript(JUri::base() . 'media/mod_simplecallback/js/simplecallback.js'); + $document->addStyleSheet(JUri::base() . 'media/mod_simplecallback/css/sweetalert.css'); + $document->addScript(JUri::base() . 'media/mod_simplecallback/js/sweetalert.min.js'); + defined('SIMPLECALLBACK') or define('SIMPLECALLBACK',1); +} + +if ($js_body == 1) { + if (!defined('SIMPLECALLBACK') || !defined('SIMPLECALLBACKDOM')) { + defined('SIMPLECALLBACKDOM') or define('SIMPLECALLBACKDOM',1); + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + } +} + + +defined('SIMPLECALLBACK') or define('SIMPLECALLBACK',1); + +JHTML::_('behavior.formvalidation'); +$zakonrf_mode = $params->get('simplecallback_zakonrf_mode'); +$zakonrf_link_text = $params->get('simplacallback_zakonrf_link_text'); +$zakonrf_link = $params->get('simplacallback_zakonrf_link'); +$overlayed = $params->get('simplecallback_overlay'); +$custom_textsimple_enabled = $params->get('simplecallback_custom_textsimple_enabled', 0); +$custom_textsimple = $params->get('simplecallback_custom_textsimple'); +$phone_field_pattern = $params->get('simplecallback_phone_field_pattern'); +$namemod_enabled = $params->get('namemod_enabled', 0); +$telmod_enabled = $params->get('telmod_enabled', 0); +$emailclient_enabled = $params->get('emailclient_enabled', 0); +$recaptcha_enabled = $params->get('simplecallback_recaptcha_enabled', 0); +$rating_enabled = $params->get('simplecallback_rating_enabled', 0); +$city_enabled = $params->get('city_enabled', 0); +$message_enabled = $params->get('simplecallback_message', 0); +$simplecallback_file_enabled = $params->get('simplecallback_file_enabled', 0); +$captcha_enabled = $params->get('simplecallback_captcha', 0); +$phone_mask = $params->get('simplecallback_phone_field_mask'); +$submit_field_css = $params->get('simplecallback_submit_field_css'); +$simplecallback_city_field_label_main = trim($params->get('simplecallback_city_field_label_main')); +$simplecallback_city_field_label = trim($params->get('simplecallback_city_field_label')); +$simplecallback_city_field_labe2 = trim($params->get('simplecallback_city_field_labe2')); +$simplecallback_city_field_labe3 = trim($params->get('simplecallback_city_field_labe3')); +$header_tag = $params->get('header_tag', 'h3'); +$header_class = $params->get('header_class', ''); +$show_title = $module->showtitle; +$name_req = $params->get('simplecallback_name_field_label_req', 0); +$emailclient_req = $params->get('simplecallback_emailclient_field_label_req', 0); +$phone_req = $params->get('simplecallback_phone_field_label_req', 0); +$message_req = $params->get('simplecallback_message_req', 0); +$custom_textsimple_req = $params->get('simplecallback_custom_textsimple_req', 0); +$name_req = ($name_req == 1) ? 'required' : '' ; +$custom_textsimple_req = ($custom_textsimple_req == 1) ? 'required' : '' ; +$emailclient_req = ($emailclient_req == 1) ? 'required' : '' ; +$phone_req = ($phone_req == 1) ? 'required' : '' ; +$message_req = ($message_req == 1) ? 'required' : '' ; +$zv_name_req = ($name_req == 'required') ? '*' : '' ; +$zv_emailclient_req = ($emailclient_req == 'required') ? '*' : '' ; +$zv_phone_req = ($phone_req == 'required') ? '*' : '' ; +$zv_message_req = ($message_req == 'required') ? '*' : '' ; +$zv_textsimple_req = ($custom_textsimple_req == 'required') ? '*' : '' ; +$my_inline_css_enabled = $params->get('simplacallback_my_inline_css_enabled', 0); +$reachgoal_enabled = $params->get('simplacallback_reachgoal_enabled', 0); +$my_inline_css = $params->get('simplacallback_my_inline_css', ''); +$textarea_width = $params->get('simplecallback_textarea_width', 0); +$textarea_width_cols = $params->get('simplecallback_textarea_width_cols', ''); +$textarea_width_rows = $params->get('simplecallback_textarea_width_rows', ''); +$reachgoal_text = $params->get('simplacallback_reachgoal_text', ''); +$redirect_enabled = $params->get('simplacallback_redirect_enabled', 0); +$redirect_url = $params->get('simplacallback_redirect_url'); +$my_text_before_enabled = $params->get('simplacallback_my_text_before_enabled', 0); +$my_text_before = $params->get('simplacallback_my_text_before'); +$my_text_after_enabled = $params->get('simplacallback_my_text_after_enabled', 0); +$my_text_after = $params->get('simplacallback_my_text_after'); +$label_enabled = $params->get('simplacallback_label_enabled', 1); +$placeholder_enabled = $params->get('simplacallback_placeholder_enabled', 0); + + + +if ($my_inline_css_enabled == 1) { + echo ''; +} + +if ($label_enabled == 0) { + echo ''; +} + +if ($textarea_width == 1) { + $textarea_width_cols = 'cols="'.$textarea_width_cols.'"'; + $textarea_width_rows = 'rows="'.$textarea_width_rows.'"'; +} +else { + $textarea_width_cols = ''; + $textarea_width_rows = ''; +} + +if ($reachgoal_enabled == 1) { + $reachgoal_text = 'onClick="'.$reachgoal_text.'"'; +} +else { + $reachgoal_text = ''; +} + + + +?> + +
" method="post" + data-simplecallback-form + + > + + +
+ +
+
×
+ + get('simplacallback_title_overlay', 0)) { + echo "<$header_tag class='$header_class'>$module->title"; + } ?> + ".$my_text_before."
"; + } + ?> + + + ".$my_text_before."
"; + } + ?> + + +
+ +
+ + + +
+ +
+ + + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + + + + + + + + + + + +
+
+
+ + + + +
+ + +
+ + + + + +
+ +
+ + + + '.$redirect_url.''; + } + else { + echo $redirect_url = ''; + } + + ?> + + +
+ + + + + + + + + +
+ + + +
display( 'captcha', 'captcha', 'captcha' ); ?>
+ +
+ + + + + + + + +
+ ".$my_text_after.""; + } + ?> + diff --git a/mod_simplecallback/tmpl/default.php b/mod_simplecallback/tmpl/default.php index 8967a41..ad2666a 100644 --- a/mod_simplecallback/tmpl/default.php +++ b/mod_simplecallback/tmpl/default.php @@ -136,24 +136,21 @@
×
+ get('simplacallback_title_overlay', 0)) { + echo "<$header_tag class='$header_class'>$module->title"; + } ?> ".$my_text_before.""; -} -?> - showtitle) { - echo "<$header_tag class='$header_class'>$module->title"; -} ?> - - - - ".$my_text_before.""; -} + if ($my_text_before_enabled == 1 && $overlayed == 1) { + echo "
".$my_text_before."
"; + } + ?> + -?> + ".$my_text_before.""; + } + ?>
@@ -314,25 +311,21 @@
display( 'captcha', 'captcha', 'captcha' ); ?>
-
- - - - - - - - -
- +
+ + + + + + + + +
+ ".$my_text_after."
"; + } + ?> - -".$my_text_after.""; -} - -?> \ No newline at end of file From f682e01876f9ab89c8133136de55ac6350bba6e8 Mon Sep 17 00:00:00 2001 From: mmth Date: Tue, 4 Dec 2018 03:16:04 +0500 Subject: [PATCH 5/6] Delete default-uikit.php --- mod_simplecallback/tmpl/default-uikit.php | 331 ---------------------- 1 file changed, 331 deletions(-) delete mode 100644 mod_simplecallback/tmpl/default-uikit.php diff --git a/mod_simplecallback/tmpl/default-uikit.php b/mod_simplecallback/tmpl/default-uikit.php deleted file mode 100644 index ad2666a..0000000 --- a/mod_simplecallback/tmpl/default-uikit.php +++ /dev/null @@ -1,331 +0,0 @@ -getMenu()->getActive()->id; -$document = JFactory::getDocument(); -$simplecallback_jq_enabled = $params->get('simplecallback_jq_enabled', 0); - -if ($simplecallback_jq_enabled == 1) { - $document->addScript(JUri::base() . 'media/jui/js/jquery.min.js'); - $document->addScript(JUri::base() . 'media/jui/js/jquery-noconflict.js'); -} - -$js_body = $params->get('simplecallback_js_body', 0); - -if (!defined('SIMPLECALLBACK') || $js_body == 0) { - - $document->addStyleSheet(JUri::base() . 'media/mod_simplecallback/css/simplecallback.css'); - $document->addScript(JUri::base() . 'media/mod_simplecallback/js/simplecallback.js'); - $document->addStyleSheet(JUri::base() . 'media/mod_simplecallback/css/sweetalert.css'); - $document->addScript(JUri::base() . 'media/mod_simplecallback/js/sweetalert.min.js'); - defined('SIMPLECALLBACK') or define('SIMPLECALLBACK',1); -} - -if ($js_body == 1) { - if (!defined('SIMPLECALLBACK') || !defined('SIMPLECALLBACKDOM')) { - defined('SIMPLECALLBACKDOM') or define('SIMPLECALLBACKDOM',1); - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - } -} - - -defined('SIMPLECALLBACK') or define('SIMPLECALLBACK',1); - -JHTML::_('behavior.formvalidation'); -$zakonrf_mode = $params->get('simplecallback_zakonrf_mode'); -$zakonrf_link_text = $params->get('simplacallback_zakonrf_link_text'); -$zakonrf_link = $params->get('simplacallback_zakonrf_link'); -$overlayed = $params->get('simplecallback_overlay'); -$custom_textsimple_enabled = $params->get('simplecallback_custom_textsimple_enabled', 0); -$custom_textsimple = $params->get('simplecallback_custom_textsimple'); -$phone_field_pattern = $params->get('simplecallback_phone_field_pattern'); -$namemod_enabled = $params->get('namemod_enabled', 0); -$telmod_enabled = $params->get('telmod_enabled', 0); -$emailclient_enabled = $params->get('emailclient_enabled', 0); -$recaptcha_enabled = $params->get('simplecallback_recaptcha_enabled', 0); -$rating_enabled = $params->get('simplecallback_rating_enabled', 0); -$city_enabled = $params->get('city_enabled', 0); -$message_enabled = $params->get('simplecallback_message', 0); -$simplecallback_file_enabled = $params->get('simplecallback_file_enabled', 0); -$captcha_enabled = $params->get('simplecallback_captcha', 0); -$phone_mask = $params->get('simplecallback_phone_field_mask'); -$submit_field_css = $params->get('simplecallback_submit_field_css'); -$simplecallback_city_field_label_main = trim($params->get('simplecallback_city_field_label_main')); -$simplecallback_city_field_label = trim($params->get('simplecallback_city_field_label')); -$simplecallback_city_field_labe2 = trim($params->get('simplecallback_city_field_labe2')); -$simplecallback_city_field_labe3 = trim($params->get('simplecallback_city_field_labe3')); -$header_tag = $params->get('header_tag', 'h3'); -$header_class = $params->get('header_class', ''); -$show_title = $module->showtitle; -$name_req = $params->get('simplecallback_name_field_label_req', 0); -$emailclient_req = $params->get('simplecallback_emailclient_field_label_req', 0); -$phone_req = $params->get('simplecallback_phone_field_label_req', 0); -$message_req = $params->get('simplecallback_message_req', 0); -$custom_textsimple_req = $params->get('simplecallback_custom_textsimple_req', 0); -$name_req = ($name_req == 1) ? 'required' : '' ; -$custom_textsimple_req = ($custom_textsimple_req == 1) ? 'required' : '' ; -$emailclient_req = ($emailclient_req == 1) ? 'required' : '' ; -$phone_req = ($phone_req == 1) ? 'required' : '' ; -$message_req = ($message_req == 1) ? 'required' : '' ; -$zv_name_req = ($name_req == 'required') ? '*' : '' ; -$zv_emailclient_req = ($emailclient_req == 'required') ? '*' : '' ; -$zv_phone_req = ($phone_req == 'required') ? '*' : '' ; -$zv_message_req = ($message_req == 'required') ? '*' : '' ; -$zv_textsimple_req = ($custom_textsimple_req == 'required') ? '*' : '' ; -$my_inline_css_enabled = $params->get('simplacallback_my_inline_css_enabled', 0); -$reachgoal_enabled = $params->get('simplacallback_reachgoal_enabled', 0); -$my_inline_css = $params->get('simplacallback_my_inline_css', ''); -$textarea_width = $params->get('simplecallback_textarea_width', 0); -$textarea_width_cols = $params->get('simplecallback_textarea_width_cols', ''); -$textarea_width_rows = $params->get('simplecallback_textarea_width_rows', ''); -$reachgoal_text = $params->get('simplacallback_reachgoal_text', ''); -$redirect_enabled = $params->get('simplacallback_redirect_enabled', 0); -$redirect_url = $params->get('simplacallback_redirect_url'); -$my_text_before_enabled = $params->get('simplacallback_my_text_before_enabled', 0); -$my_text_before = $params->get('simplacallback_my_text_before'); -$my_text_after_enabled = $params->get('simplacallback_my_text_after_enabled', 0); -$my_text_after = $params->get('simplacallback_my_text_after'); -$label_enabled = $params->get('simplacallback_label_enabled', 1); -$placeholder_enabled = $params->get('simplacallback_placeholder_enabled', 0); - - - -if ($my_inline_css_enabled == 1) { - echo ''; -} - -if ($label_enabled == 0) { - echo ''; -} - -if ($textarea_width == 1) { - $textarea_width_cols = 'cols="'.$textarea_width_cols.'"'; - $textarea_width_rows = 'rows="'.$textarea_width_rows.'"'; -} -else { - $textarea_width_cols = ''; - $textarea_width_rows = ''; -} - -if ($reachgoal_enabled == 1) { - $reachgoal_text = 'onClick="'.$reachgoal_text.'"'; -} -else { - $reachgoal_text = ''; -} - - - -?> - -
" method="post" - data-simplecallback-form - - > - - -
- -
-
×
- - get('simplacallback_title_overlay', 0)) { - echo "<$header_tag class='$header_class'>$module->title"; - } ?> - ".$my_text_before.""; - } - ?> - - - ".$my_text_before.""; - } - ?> - - -
- -
- - - -
- -
- - - - - -
- -
- - - - -
- -
- - - - -
- -
- -
- - - -
- -
-
- - - - - - - - - - - - - - -
-
-
- - - - -
- - -
- - - - - -
- -
- - - - '.$redirect_url.''; - } - else { - echo $redirect_url = ''; - } - - ?> - - -
- - - - - - - - - -
- - - -
display( 'captcha', 'captcha', 'captcha' ); ?>
- -
- - - - - - - - -
- ".$my_text_after.""; - } - ?> -
From 17327a415e5187092c0d07b6171f93468b940de1 Mon Sep 17 00:00:00 2001 From: mmth Date: Tue, 4 Dec 2018 07:18:00 +0500 Subject: [PATCH 6/6] overlay pos center --- .../media/mod_simplecallback/css/simplecallback.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css b/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css index 6f0712e..bdd2548 100644 --- a/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css +++ b/mod_simplecallback/media/mod_simplecallback/css/simplecallback.css @@ -42,13 +42,14 @@ input#customFile { position: absolute; left: 50%; top: 30px; - margin-left: -130px; + margin-left: -180px; z-index: 10010; background: #fff; padding: 30px; text-align: left; border-radius: 5px; box-shadow: 0 0 20px rgba(0,0,0, 0.5); + box-sizing: border-box; } .simplecallback-overlayed.simplecallback-loading::before {