Skip to content

Commit dc969a1

Browse files
razvanaldea89razvanaldea89
committed
added modula. bug fixing
1 parent da9b4c9 commit dc969a1

File tree

6 files changed

+81
-42
lines changed

6 files changed

+81
-42
lines changed

‎admin.php‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function mfbfw_options_page() {
55

66
?>
77

8-
<div class="wrap about-wrap full-width-layout">
8+
<div class="wrap about-wrap full-width-layout fbfw-wrap">
99
<div id="icon-plugins" class="icon32"></div>
1010
<div class="inlined">
1111
<div id="pluginDescription">
@@ -73,13 +73,22 @@ class="button-secondary" value="<?php esc_attr_e( 'Revert to defaults', 'mfbfw'
7373
</div>
7474

7575
<div id="mfbfwd"
76-
style="border-top:1px dashed #DDDDDD;margin:20px 0 40px;overflow:hidden;padding-top:25px;width:100%;float:left">
76+
style="border-top:1px dashed #DDDDDD;margin:20px 0 40px;overflow:hidden;padding-top:25px;width:100%;float:left;display:block !important;">
7777

7878
Plugin developed and supported by <a href="https://colorlib.com">Colorlib</a>
7979

8080
</div>
8181

8282
</div>
83+
<a href="https://wp-modula.com" class="modula-link">
84+
<div class="modula-wrap">
85+
<img src="<?php echo FBFW_URL; ?>assets/images/modula-300x300.jpg"/>
86+
<h1>Easy Image Gallery for WP</h1>
87+
<p>Modula is creative! Modula is dynamic! Modula doesn’t always look the same. Just have fun with it! Modula
88+
uses a new concept to build its internal grid. The result is a dynamic, creative, interesting and attractive
89+
gallery.</p>
90+
</div>
91+
</a>
8392

8493
<?php
8594
}

‎assets/css/fancybox-admin.css‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ span.switch-text {
286286
right: 0;
287287
left: 0;
288288
bottom: 0;
289-
height: 100%;
289+
height: calc(100% - 5px);
290290
z-index: 2;
291291
background: rgba(0, 0, 0, .6);
292292
display: flex;
@@ -298,8 +298,8 @@ span.switch-text {
298298
}
299299

300300
.start-editing p {
301-
dispaly: block;
302-
font-size: 20px;
301+
display: block;
302+
font-size: 20px !important;
303303
}
304304

305305
#callbackBlock label,
@@ -334,13 +334,28 @@ tr.spacer {
334334
}
335335

336336
.line-spacer {
337-
height:15px;
337+
height: 15px;
338338
}
339339

340340
.hidden-block {
341341
margin-top: 15px;
342342
}
343343

344+
.fbfw-wrap {
345+
max-width:80%;
346+
float:left;
347+
}
348+
349+
.modula-wrap {
350+
float: left;
351+
max-width: 20%;
352+
padding-top: 32px;
353+
}
354+
355+
a.modula-link {
356+
color:#000;
357+
}
358+
344359
.cf:after,
345360
.cf:before {
346361
content: " ";

‎assets/images/modula-300x300.jpg‎

26.8 KB
Loading

‎assets/js/admin.js‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ jQuery(function () {
33
// Tabs
44
jQuery("#fbfwTabs").tabs();
55

6-
// Hide Donation and twitter stuff on tabs other than Info
7-
jQuery("#fbfwTabs li a").click(function () {
8-
if (jQuery(this).is("#ui-id-1")) {
9-
jQuery("#mfbfwd").show();
10-
} else {
11-
jQuery("#mfbfwd").hide();
12-
}
13-
});
14-
15-
166
// Hide form fields when not needed (switched by checkbox)
177
function switchBlock(block, button) {
188
var buttonValue = jQuery(button + ":checked").val();

‎fancybox.php‎

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,18 @@ function mfbfw_defaults() {
6060
// Appearance
6161
'border' => '',
6262
'borderColor' => '#BBBBBB',
63-
'showCloseButton' => 'on',
6463
'paddingColor' => '#FFFFFF',
65-
'padding' => '15',
64+
'padding' => '10',
6665
'overlayShow' => 'on',
6766
'overlayColor' => '#000000',
68-
'overlayOpacity' => '0.7',
67+
'overlayOpacity' => '0.3',
6968
'titleShow' => 'on',
7069
'titlePosition' => 'inside',
7170
'titleColor' => '#333333',
7271
'showNavArrows' => 'on',
7372
'titleSize' => '14',
74-
'showCloseButton' => 'true',
75-
'showToolbar' => 'true',
73+
'showCloseButton' => '',
74+
'showToolbar' => 'on',
7675
// Animations
7776
'zoomOpacity' => 'on',
7877
'zoomSpeedIn' => '500',
@@ -83,12 +82,12 @@ function mfbfw_defaults() {
8382
'hideOnOverlayClick' => 'function(current, event) {
8483
return current.type === "image" ? "close" : false;
8584
},',
86-
'hideOnContentClick' => 'on',
85+
'hideOnContentClick' => '',
8786
'enableEscapeButton' => 'on',
88-
'cyclic' => 'on',
89-
'mouseWheel' => 'off',
90-
'disableWoocommercePages' => 'off',
91-
'disableWoocommerceProducts' => 'off',
87+
'cyclic' => '',
88+
'mouseWheel' => '',
89+
'disableWoocommercePages' => '',
90+
'disableWoocommerceProducts' => '',
9291
// Gallery Type
9392
'galleryType' => 'all',
9493
'customExpression' => 'jQuery(thumbnails).attr("data-fancybox","gallery").getTitle();',
@@ -106,11 +105,12 @@ function mfbfw_defaults() {
106105
'copyTitleFunction' => 'var arr = jQuery("a[data-fancybox]");
107106
jQuery.each(arr, function() {
108107
var title = jQuery(this).children("img").attr("title");
109-
jQuery(this).attr("title",title);
108+
var caption = jQuery(this).next("figcaption").html();
109+
if(caption.length){jQuery(this).attr("title",title+" " + caption)}else{ jQuery(this).attr("title",title);}console.log(caption);
110110
}); ',
111111
'nojQuery' => '',
112112
'extraCallsEnable' => '',
113-
'extraCalls' => '',
113+
'extraCallsData' => '',
114114
'uninstall' => '',
115115
);
116116

@@ -197,12 +197,31 @@ function mfbfw_init() {
197197
'}';
198198

199199
// fix undefined index copyTitleFunction. $mfbfw array misses this index.
200+
200201
$mfbfw['copyTitleFunction'] = 'var arr = jQuery("a[data-fancybox]");
201202
jQuery.each(arr, function() {
202203
var title = jQuery(this).children("img").attr("title");
203-
jQuery(this).attr("title",title);
204+
var caption = jQuery(this).next("figcaption").html();
205+
if(caption && title){jQuery(this).attr("title",title+" " + caption)}else if(title){ jQuery(this).attr("title",title);}else if(caption){jQuery(this).attr("title",caption);}
204206
}); ';
205207

208+
209+
if ( $mfbfw['titlePosition'] == 'inside' ) {
210+
$afterLoad = 'function( instance, current ) {';
211+
$afterLoad .= 'current.$content.append(\'<div class=\"fancybox-custom-caption\" style=\" position: absolute;left:0;right:0;color:#000;padding-top:10px;bottom:-50px;background:#fff;margin:0 auto;text-align:center; \">\' + current.opts.caption + \'</div>\');';
212+
$afterLoad .= '}';
213+
$hideCaption = 'div.fancybox-caption{display:none !important;}';
214+
} else if ( $mfbfw['titlePosition'] == 'over' ) {
215+
$afterLoad = 'function( instance, current ) {';
216+
$afterLoad .= 'current.$content.append(\'<div class=\"fancybox-custom-caption\" style=\" position: absolute;left:0;right:0;color:#000;padding-top:10px;bottom:0;background:#fff;margin:0 auto;text-align:center; \">\' + current.opts.caption + \'</div>\');';
217+
$afterLoad .= '}';
218+
$hideCaption = 'div.fancybox-caption{display:none !important;}';
219+
} else {
220+
$afterLoad .= '""';
221+
$hideCaption = '';
222+
}
223+
224+
206225
if ( isset( $mfbfw['autoDimensions'] ) && $mfbfw['autoDimensions'] == true ) {
207226
$frameSize = '';
208227
} else {
@@ -218,7 +237,7 @@ function mfbfw_init() {
218237
if ( $mfbfw['titlePosition'] == 'inside' ) {
219238
$captionPosition = 'div.fancybox-caption p.caption-title {background:#fff; width:auto;padding:10px 30px;}';
220239
} elseif ( $mfbfw['titlePosition'] == 'float' ) {
221-
$captionPosition = 'div.fancybox-caption p.caption-title {background:transparent;}';
240+
$captionPosition = 'div.fancybox-caption p.caption-title {background:#fff;color:#000;padding:10px 30px;width:auto;}';
222241
} else {
223242
$captionPosition = 'div.fancybox-caption {position:relative;max-width:50%;margin:0 auto;min-width:480px;padding:15px;}div.fancybox-caption p.caption-title{position:relative;left:0;right:0;margin:0 auto;top:0px;color:#fff;}';
224243
}
@@ -232,8 +251,9 @@ function mfbfw_init() {
232251
echo '
233252
<!-- Fancybox for WordPress v' . $mfbfw_version . ' -->
234253
<style type="text/css">
254+
'.$hideCaption.'
235255
' . ( isset( $mfbfw['overlayShow'] ) ? '' : 'div.fancybox-bg{background:transparent !important;}' ) . '
236-
' .'img.fancybox-image{border-width:'.$mfbfw['padding'].'px;border-color:'.$mfbfw['paddingColor'].';border-style:solid;}' . '
256+
' . 'img.fancybox-image{border-width:' . $mfbfw['padding'] . 'px;border-color:' . $mfbfw['paddingColor'] . ';border-style:solid;}' . '
237257
' . ( isset( $mfbfw['overlayColor'] ) && $mfbfw['overlayColor'] ? 'div.fancybox-bg{background-color:' . hexTorgba( $mfbfw['overlayColor'], $mfbfw['overlayOpacity'] ) . ';opacity:1 !important;}' : '' ) . ( isset( $mfbfw['paddingColor'] ) && $mfbfw['paddingColor'] ? 'div.fancybox-content{border-color:' . $mfbfw['paddingColor'] . '}' : '' ) . '
238258
' . ( isset( $mfbfw['paddingColor'] ) && $mfbfw['paddingColor'] && $mfbfw['titlePosition'] == 'inside' ? 'div#fancybox-title{background-color:' . $mfbfw['paddingColor'] . '}' : '' ) . '
239259
div.fancybox-content{background-color:' . $mfbfw['paddingColor'] . ( isset( $mfbfw['border'] ) && $mfbfw['border'] ? ';border:1px solid ' . $mfbfw['borderColor'] : '' ) . '}
@@ -243,7 +263,7 @@ function mfbfw_init() {
243263
' . ( isset( $mfbfw['shadowSize'] ) && $mfbfw['shadowOffset'] && $mfbfw['shadowOpacity'] ? 'div.fancybox-content{box-shadow:0 ' . $mfbfw['shadowOffset'] . 'px ' . $mfbfw['shadowSize'] . 'px rgba(0,0,0,' . $mfbfw['shadowOpacity'] . ')}' : '' ) . '
244264
' . ( isset( $mfbfw['titleShow'] ) ? 'div.fancybox-caption p.caption-title{display:inline-block}' : 'div.fancybox-caption p.caption-title{display:none}div.fancybox-caption{display:none;}' ) . '
245265
' . ( isset( $mfbfw['titleSize'] ) ? 'div.fancybox-caption p.caption-title{font-size:' . $mfbfw['titleSize'] . 'px}' : 'div.fancybox-caption p.caption-title{font-size:14px}' ) . '
246-
' . ( isset( $mfbfw['titleColor'] ) && $mfbfw['titlePosition'] == 'inside' ? 'div.fancybox-caption p.caption-title{color:' . $mfbfw['titleColor'] . '}' : 'div.fancybox-caption p.caption-title{color:#fff}' ) . '
266+
' . ( isset( $mfbfw['titleColor'] ) && $mfbfw['titlePosition'] == 'inside' ? 'div.fancybox-caption p.caption-title{color:' . $mfbfw['titleColor'] . '}' : 'div.fancybox-caption p.caption-title{color:#fff}' ) . '
247267
' . ( isset( $mfbfw['titlePosition'] ) ? 'div.fancybox-caption {color:' . $mfbfw['titleColor'] . '}' : 'div.fancybox-caption p.caption-title{color:#333333}' ) . $captionPosition . '
248268
</style>';
249269

@@ -313,28 +333,29 @@ function mfbfw_init() {
313333
"animationEffect": "' . $mfbfw['transitionIn'] . '",
314334
"animationDuration": ' . $mfbfw['zoomSpeedIn'] . ',
315335
"transitionEffect": "' . $mfbfw['transitionEffect'] . '",
316-
"transitionDuration" : "'.$mfbfw['zoomSpeedChange'].'",
336+
"transitionDuration" : "' . $mfbfw['zoomSpeedChange'] . '",
317337
"overlayShow": ' . ( isset( $mfbfw['overlayShow'] ) && $mfbfw['overlayShow'] ? 'true' : 'false' ) . ',
318338
"overlayOpacity": "' . $mfbfw['overlayOpacity'] . '",
319339
"titleShow": ' . ( isset( $mfbfw['titleShow'] ) && $mfbfw['titleShow'] ? 'true' : 'false' ) . ',
320340
"titlePosition": "' . $mfbfw['titlePosition'] . '",
321341
"keyboard": ' . ( isset( $mfbfw['enableEscapeButton'] ) && $mfbfw['enableEscapeButton'] ? 'true' : 'false' ) . ',
322342
"showCloseButton": ' . ( isset( $mfbfw['showCloseButton'] ) && $mfbfw['showCloseButton'] ? 'true' : 'false' ) . ',
323343
"arrows": ' . ( isset( $mfbfw['showNavArrows'] ) && $mfbfw['showNavArrows'] ? 'true' : 'false' ) . ',
324-
"clickSlide": ' . ( isset( $mfbfw['hideOnContentClick'] ) && $mfbfw['hideOnContentClick'] ? '"close"' : 'false' ) . ',
325-
"clickContent": ' . ( isset( $mfbfw['hideOnOverlayClick'] ) && $mfbfw['hideOnOverlayClick'] ? 'function(current, event) {
344+
"clickContent": ' . ( isset( $mfbfw['hideOnContentClick'] ) && $mfbfw['hideOnContentClick'] ? '"close"' : 'false' ) . ',
345+
"clickSlide": ' . ( isset( $mfbfw['hideOnOverlayClick'] ) && $mfbfw['hideOnOverlayClick'] ? 'function(current, event) {
326346
return current.type === "image" ? "close" : false;
327347
}' : 'false' ) . ',
328348
"wheel": ' . ( isset( $mfbfw['mouseWheel'] ) && $mfbfw['mouseWheel'] ? 'true' : 'false' ) . ',
329349
' . $frameSize . '
330350
"onInit": ' . ( isset( $mfbfw['callbackEnable'], $mfbfw['callbackOnStart'] ) && $mfbfw['callbackEnable'] && $mfbfw['callbackOnStart'] ? $mfbfw['callbackOnStart'] . ',' : 'function() { },' ) . '
331351
"onDeactivate": ' . ( isset( $mfbfw['callbackEnable'], $mfbfw['callbackOnCancel'] ) && $mfbfw['callbackEnable'] && $mfbfw['callbackOnCancel'] ? $mfbfw['callbackOnCancel'] . ',' : 'function() { },' ) . '
332352
"beforeClose": ' . ( isset( $mfbfw['callbackEnable'], $mfbfw['callbackOnCleanup'] ) && $mfbfw['callbackEnable'] && $mfbfw['callbackOnCleanup'] ? $mfbfw['callbackOnCleanup'] . ',' : 'function() { },' ) . '
333-
"afterLoad": ' . ( isset( $mfbfw['callbackEnable'], $mfbfw['callbackOnComplete'] ) && $mfbfw['callbackEnable'] && $mfbfw['callbackOnComplete'] ? $mfbfw['callbackOnComplete'] . ',' : 'function() { },' ) . '
353+
"afterShow": ' . ( isset( $mfbfw['callbackEnable'], $mfbfw['callbackOnComplete'] ) && $mfbfw['callbackEnable'] && $mfbfw['callbackOnComplete'] ? $mfbfw['callbackOnComplete'] . ',' : 'function() { },' ) . '
334354
"afterClose": ' . ( isset( $mfbfw['callbackEnable'], $mfbfw['callbackOnClose'] ) && $mfbfw['callbackEnable'] && $mfbfw['callbackOnClose'] ? $mfbfw['callbackOnClose'] . ',' : 'function() { },' ) . '
335355
"toolbar":' . ( isset( $mfbfw['showToolbar'] ) && $mfbfw['showToolbar'] ? 'true' : 'false' ) . ',
336356
"preventCaptionOverlap": true,
337357
"caption" : ' . $caption . ',
358+
"afterLoad" : ' . $afterLoad . ',
338359
});
339360
';
340361

@@ -498,11 +519,15 @@ function hexTorgba( $hexColor, $opacity ) {
498519
*/
499520

500521
function fancy_check_if_woocommerce() {
501-
if ( get_post_type( get_the_id() ) == 'product' ) {
502-
return 'product';
503-
} else if ( is_shop() ) {
504-
return 'shop_page';
522+
if ( class_exists( 'WooCommerce' ) ) {
523+
if ( is_shop() ) {
524+
return 'shop_page';
525+
} else if ( get_post_type( get_the_id() ) == 'product' ) {
526+
return 'product';
527+
} else {
528+
return 'true';
529+
}
505530
} else {
506-
return true;
531+
return 'true';
507532
}
508533
}

‎lib/admin-tab-appearance.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
} ?> />
1515
<label for="showCloseButton" class="onoffswitch-label">
1616
</label>
17-
<span class="switch-text"><?php _e( 'Show Close button (default: on)', 'mfbfw' ); ?></span>
17+
<span class="switch-text"><?php _e( 'Show Close button (default: off)', 'mfbfw' ); ?></span>
1818
<div class="cf"></div>
1919
</fieldset>
2020
</td>

0 commit comments

Comments
 (0)