Skip to content

overlay update #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exmmth wants to merge 7 commits into
base: master
Choose a base branch
from
Open

overlay update #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
214220d
Merge pull request #1 from CB9TOIIIA/master
exmmth Dec 2, 2018
4a487b1
fix regExp for phone mask
exmmth Dec 2, 2018
5045314
small screen, close overlay
exmmth Dec 3, 2018
b769f57
Close btn
exmmth Dec 3, 2018
d2ef305
text before&after, title
exmmth Dec 3, 2018
f682e01
Delete default-uikit.php
exmmth Dec 3, 2018
17327a4
overlay pos center
exmmth Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion mod_simplecallback/media/mod_simplecallback/css/simplecallback.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -89,6 +90,7 @@ input#customFile {
position: absolute;
right: 10px;
top: 10px;
text-align: center;
}

.simplecallback-close:hover {
Expand Down Expand Up @@ -177,4 +179,32 @@ 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;
line-height: 40px;
}
}
@media only screen and (max-width: 320px){
.simplecallback-overlayed{
padding: 20px;
}
}
2 changes: 1 addition & 1 deletion mod_simplecallback/media/mod_simplecallback/js/simplecallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
});

if ($('[data-simplecallback-form-overlayed]').length > 0) {
var overlay = $('<div class="simplecallback-overlay">');
var overlay = $('<div class="simplecallback-overlay" data-simplecallback-close>');
$('body').prepend(overlay);
}

Expand Down
12 changes: 11 additions & 1 deletion mod_simplecallback/mod_simplecallback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
name="simplecallback_phone_field_pattern"
label="Паттерн проверки (RegExp)"
description=""
default="(\+?\d[- .]*){6,14}"></field>
default="(\+?\d[- .()]*){6,14}"></field>
<field
type="spacer"
name="myspacerexexp4"
Expand Down Expand Up @@ -455,6 +455,16 @@
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
type="radio"
name="simplacallback_title_overlay"
label="Включить title у overlay?"
description=""
default="0"
class="btn-group btn-group-yesno">
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
</fieldset>
<fieldset name="crossposting" label="Кросспостинг">

Expand Down
67 changes: 30 additions & 37 deletions mod_simplecallback/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,24 +136,21 @@
</div>
<div class="simplecallback-close" data-simplecallback-close>&times;</div>

<?php if ($params->get('simplacallback_title_overlay', 0)) {
echo "<$header_tag class='$header_class'>$module->title</$header_tag>";
} ?>
<?php
if ($my_text_before_enabled == 1 && $overlayed == 1) {
echo "<div class='beforeformtext'>".$my_text_before."</div>";
}
?>
<?php if ($module->showtitle) {
echo "<$header_tag class='$header_class'>$module->title</$header_tag>";
} ?>
<?php endif; ?>


<?php

if ($my_text_before_enabled == 1 && $overlayed != 1) {
echo "<div class='beforeformtext'>".$my_text_before."</div>";
}
if ($my_text_before_enabled == 1 && $overlayed == 1) {
echo "<div class='beforeformtext form-group'>".$my_text_before."</div>";
}
?>
<?php endif; ?>

?>
<?php
if ($my_text_before_enabled == 1 && $overlayed != 1) {
echo "<div class='beforeformtext'>".$my_text_before."</div>";
}
?>

<?php if ($namemod_enabled == 1) : ?>
<div class="form-group">
Expand Down Expand Up @@ -314,25 +311,21 @@
<?php if ($recaptcha_enabled == 1) : ?>
<div class="row"> <div class="col-sm"> <?php echo JCaptcha::getInstance( 'recaptcha' )->display( 'captcha', 'captcha', 'captcha' ); ?> </div> </div>
<?php endif; ?>
<div class="form-group">
<input type="text" name="simplecallback_username" class="simplecallback-username" maxlength="10">
<?php echo JHtml::_( 'form.token' ); ?>
<input type="hidden" name="module_id" value="<?php echo $module->id; ?>" />
<input type="hidden" name="Itemid" value="<?php echo $menu; ?>">
<input type="hidden" name="simplecallback_page_title" value="<?php echo $document->getTitle(); ?>">
<input type="hidden" name="simplecallback_page_url" value="<?php echo JUri::getInstance()->toString(); ?>">
<input type="hidden" name="simplecallback_custom_data" value="">
<button type="submit" <?php echo $reachgoal_text ?> class="<?php echo $submit_field_css; ?>">
<?php echo $params->get('simplecallback_submit_field_label'); ?>
</button>
</div>

<div class="form-group">
<input type="text" name="simplecallback_username" class="simplecallback-username" maxlength="10">
<?php echo JHtml::_( 'form.token' ); ?>
<input type="hidden" name="module_id" value="<?php echo $module->id; ?>" />
<input type="hidden" name="Itemid" value="<?php echo $menu; ?>">
<input type="hidden" name="simplecallback_page_title" value="<?php echo $document->getTitle(); ?>">
<input type="hidden" name="simplecallback_page_url" value="<?php echo JUri::getInstance()->toString(); ?>">
<input type="hidden" name="simplecallback_custom_data" value="">
<button type="submit" <?php echo $reachgoal_text ?> class="<?php echo $submit_field_css; ?>">
<?php echo $params->get('simplecallback_submit_field_label'); ?>
</button>
</div>
<?php
if ($my_text_after_enabled == 1) {
echo "<div class='afterformtext'>".$my_text_after."</div>";
}
?>
</form>

<?php

if ($my_text_after_enabled == 1) {
echo "<div class='afterformtext'>".$my_text_after."</div>";
}

?>