elementor/activity-log
1
0
Fork 0
mirror of https://ghproxy.net/https://github.com/elementor/activity-log.git synced 2025-10-04 21:35:12 +08:00
Code Issues Packages Activity Actions

update freemius

Browse source
This commit is contained in:
Yakir Sitbon 2016-01-04 18:47:40 +02:00
parent 8009365f77
commit 7121a8231d
11 changed files with 375 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -7,6 +7,7 @@ language: php

# PHP version used in first build configuration.
php:
- 5.2
- 5.3
- 5.4
- 5.5

19
aryo-activity-log.php
View file

@ -162,9 +162,24 @@ final class AAL_Main {
),
)
);
if ( $this->freemius->is_plugin_update() ) {
$this->freemius->add_filter( 'connect_message', array( &$this, '_freemius_custom_connect_message' ), WP_FS__DEFAULT_PRIORITY, 6 );
}
}

public function _freemius_custom_connect_message( $message, $user_first_name, $plugin_title, $user_login, $site_link, $freemius_link ) {
return sprintf(
__(
'<b>Please help us improve %1$s!</b><br>
If you opt-in, some data about your usage of <b>%1$s</b> will be sent to %2$s.
If you skip this, that\'s okay! <b>%1$s</b> will still work just fine.',
'aryo-activity-log'
),
$this->freemius->get_plugin_name(),
$freemius_link
);
}

}
AAL_Main::instance();

// EOF

2
classes/freemius/assets/css/admin/connect.css
View file

@ -1 +1 @@
#fs_connect{width:480px;-moz-box-shadow:0px 1px 2px rgba(0,0,0,0.3);-webkit-box-shadow:0px 1px 2px rgba(0,0,0,0.3);box-shadow:0px 1px 2px rgba(0,0,0,0.3);margin:20px 0}@media screen and (max-width: 479px){#fs_connect{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;width:auto;margin:0 0 0 -10px}}#fs_connect .fs-content{background:#fff;padding:15px 20px}#fs_connect .fs-content p{margin:0;padding:0;font-size:1.2em}#fs_connect .fs-actions{padding:10px 20px;background:#C0C7CA}#fs_connect .fs-actions .button{padding:0 10px 1px;line-height:35px;height:37px;font-size:16px;margin-bottom:0}#fs_connect .fs-actions .button .dashicons{font-size:37px;margin-left:-8px;margin-right:12px}#fs_connect .fs-actions .button.button-primary{padding-right:15px;padding-left:15px}#fs_connect .fs-actions .button.button-secondary{float:right}#fs_connect.fs-anonymous-disabled .fs-actions .button.button-primary{width:100%}#fs_connect .fs-permissions{padding:10px 20px;background:#FEFEFE;-moz-transition:background 0.5s ease;-o-transition:background 0.5s ease;-ms-transition:background 0.5s ease;-webkit-transition:background 0.5s ease;transition:background 0.5s ease}#fs_connect .fs-permissions .fs-trigger{font-size:0.9em;text-decoration:none;text-align:center;display:block}#fs_connect .fs-permissions ul{height:0;overflow:hidden;margin:0}#fs_connect .fs-permissions ul li{margin-bottom:12px}#fs_connect .fs-permissions ul li:last-child{margin-bottom:0}#fs_connect .fs-permissions ul li i.dashicons{float:left;font-size:40px;width:40px;height:40px}#fs_connect .fs-permissions ul li div{margin-left:55px}#fs_connect .fs-permissions ul li div span{font-weight:bold;text-transform:uppercase;color:#23282d}#fs_connect .fs-permissions ul li div p{margin:2px 0 0 0}#fs_connect .fs-permissions.fs-open{background:#fff}#fs_connect .fs-permissions.fs-open ul{height:auto;margin:20px 20px 10px 20px}@media screen and (max-width: 479px){#fs_connect .fs-permissions{background:#fff}#fs_connect .fs-permissions .fs-trigger{display:none}#fs_connect .fs-permissions ul{height:auto;margin:20px}}#fs_connect .fs-visual{padding:12px;line-height:0;background:#fafafa;height:80px;position:relative}#fs_connect .fs-visual .fs-site-icon{position:absolute;left:20px;top:10px}#fs_connect .fs-visual .fs-connect-logo{position:absolute;right:20px;top:10px}#fs_connect .fs-visual .fs-plugin-icon{position:absolute;top:10px;left:50%;margin-left:-40px}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-site-icon,#fs_connect .fs-visual img,#fs_connect .fs-visual object{width:80px;height:80px}#fs_connect .fs-visual .dashicons-wordpress{font-size:64px;background:#01749a;color:#fff;width:64px;height:64px;padding:8px}#fs_connect .fs-visual .dashicons-plus{position:absolute;top:50%;font-size:30px;margin-top:-10px;color:#bbb}#fs_connect .fs-visual .dashicons-plus.fs-first{left:28%}#fs_connect .fs-visual .dashicons-plus.fs-second{left:65%}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-connect-logo,#fs_connect .fs-visual .fs-site-icon{border:1px solid #ccc;padding:1px;background:#fff}#fs_connect .fs-terms{text-align:center;font-size:0.85em;padding:5px;background:rgba(0,0,0,0.05)}#fs_connect .fs-terms,#fs_connect .fs-terms a{color:#999}#fs_connect .fs-terms a{text-decoration:none}
#fs_connect{width:480px;-moz-box-shadow:0px 1px 2px rgba(0,0,0,0.3);-webkit-box-shadow:0px 1px 2px rgba(0,0,0,0.3);box-shadow:0px 1px 2px rgba(0,0,0,0.3);margin:20px 0}@media screen and (max-width: 479px){#fs_connect{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;width:auto;margin:0 0 0 -10px}}#fs_connect .fs-content{background:#fff;padding:15px 20px}#fs_connect .fs-content p{margin:0;padding:0;font-size:1.2em}#fs_connect .fs-actions{padding:10px 20px;background:#C0C7CA}#fs_connect .fs-actions .button{padding:0 10px 1px;line-height:35px;height:37px;font-size:16px;margin-bottom:0}#fs_connect .fs-actions .button .dashicons{font-size:37px;margin-left:-8px;margin-right:12px}#fs_connect .fs-actions .button.button-primary{padding-right:15px;padding-left:15px}#fs_connect .fs-actions .button.button-primary:after{content:' \279C'}#fs_connect .fs-actions .button.button-secondary{float:right}#fs_connect.fs-anonymous-disabled .fs-actions .button.button-primary{width:100%}#fs_connect .fs-permissions{padding:10px 20px;background:#FEFEFE;-moz-transition:background 0.5s ease;-o-transition:background 0.5s ease;-ms-transition:background 0.5s ease;-webkit-transition:background 0.5s ease;transition:background 0.5s ease}#fs_connect .fs-permissions .fs-trigger{font-size:0.9em;text-decoration:none;text-align:center;display:block}#fs_connect .fs-permissions ul{height:0;overflow:hidden;margin:0}#fs_connect .fs-permissions ul li{margin-bottom:12px}#fs_connect .fs-permissions ul li:last-child{margin-bottom:0}#fs_connect .fs-permissions ul li i.dashicons{float:left;font-size:40px;width:40px;height:40px}#fs_connect .fs-permissions ul li div{margin-left:55px}#fs_connect .fs-permissions ul li div span{font-weight:bold;text-transform:uppercase;color:#23282d}#fs_connect .fs-permissions ul li div p{margin:2px 0 0 0}#fs_connect .fs-permissions.fs-open{background:#fff}#fs_connect .fs-permissions.fs-open ul{height:auto;margin:20px 20px 10px 20px}@media screen and (max-width: 479px){#fs_connect .fs-permissions{background:#fff}#fs_connect .fs-permissions .fs-trigger{display:none}#fs_connect .fs-permissions ul{height:auto;margin:20px}}#fs_connect .fs-visual{padding:12px;line-height:0;background:#fafafa;height:80px;position:relative}#fs_connect .fs-visual .fs-site-icon{position:absolute;left:20px;top:10px}#fs_connect .fs-visual .fs-connect-logo{position:absolute;right:20px;top:10px}#fs_connect .fs-visual .fs-plugin-icon{position:absolute;top:10px;left:50%;margin-left:-40px}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-site-icon,#fs_connect .fs-visual img,#fs_connect .fs-visual object{width:80px;height:80px}#fs_connect .fs-visual .dashicons-wordpress{font-size:64px;background:#01749a;color:#fff;width:64px;height:64px;padding:8px}#fs_connect .fs-visual .dashicons-plus{position:absolute;top:50%;font-size:30px;margin-top:-10px;color:#bbb}#fs_connect .fs-visual .dashicons-plus.fs-first{left:28%}#fs_connect .fs-visual .dashicons-plus.fs-second{left:65%}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-connect-logo,#fs_connect .fs-visual .fs-site-icon{border:1px solid #ccc;padding:1px;background:#fff}#fs_connect .fs-terms{text-align:center;font-size:0.85em;padding:5px;background:rgba(0,0,0,0.05)}#fs_connect .fs-terms,#fs_connect .fs-terms a{color:#999}#fs_connect .fs-terms a{text-decoration:none}.rtl #fs_connect .fs-actions{padding:10px 20px;background:#C0C7CA}.rtl #fs_connect .fs-actions .button .dashicons{font-size:37px;margin-left:-8px;margin-right:12px}.rtl #fs_connect .fs-actions .button.button-primary:after{content:' \000bb'}.rtl #fs_connect .fs-actions .button.button-secondary{float:left}.rtl #fs_connect .fs-permissions ul li div{margin-right:55px;margin-left:0}.rtl #fs_connect .fs-permissions ul li i.dashicons{float:right}.rtl #fs_connect .fs-visual .fs-site-icon{right:20px;left:auto}.rtl #fs_connect .fs-visual .fs-connect-logo{right:auto;left:20px}.wp-pointer-content #fs_connect{margin:0;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.fs-opt-in-pointer .wp-pointer-content{padding:0}.fs-opt-in-pointer.wp-pointer-top .wp-pointer-arrow{border-bottom-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-top .wp-pointer-arrow-inner{border-bottom-color:#fafafa}.fs-opt-in-pointer.wp-pointer-bottom .wp-pointer-arrow{border-top-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-bottom .wp-pointer-arrow-inner{border-top-color:#fafafa}.fs-opt-in-pointer.wp-pointer-left .wp-pointer-arrow{border-right-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-left .wp-pointer-arrow-inner{border-right-color:#fafafa}.fs-opt-in-pointer.wp-pointer-right .wp-pointer-arrow{border-left-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-right .wp-pointer-arrow-inner{border-left-color:#fafafa}

78
classes/freemius/assets/img/icon.svg Normal file
View file

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="256px"
height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
<g id="Layer_2">
<rect fill="#C91E60" width="256" height="256"/>
</g>
<g id="Layer_5">
<text transform="matrix(1 0 0 1 64.1411 78.187)"><tspan x="0" y="0" fill="#FFFFFF" font-family="'Helvetica-Light'" font-size="39.6274">Activity</tspan><tspan x="29.72" y="47.553" fill="#FFFFFF" font-family="'Helvetica-Light'" font-size="39.6274">Log</tspan></text>
</g>
<g id="Layer_4">
<g>
<path fill="none" d="M153.006,225.923c-13.807,0-25-11.193-25-25s11.193-25,25-25H256V0H0v256h256v-30.077H153.006z"/>
<path fill="#FFFFFF" d="M128.006,200.923c0,13.807,11.193,25,25,25H256v-50H153.006
C139.199,175.923,128.006,187.116,128.006,200.923z"/>
</g>
</g>
<g id="Layer_6">
<g>
<path fill="#C91E60" d="M166.129,200.071c0,1.251-0.235,2.424-0.707,3.52c-0.472,1.099-1.121,2.059-1.946,2.885
c-0.826,0.825-1.786,1.473-2.883,1.945c-1.098,0.471-2.27,0.707-3.521,0.707c-1.085,0-2.104-0.178-3.06-0.53
c-0.956-0.354-1.821-0.837-2.601-1.45v7.075c0,0.472-0.165,0.871-0.495,1.202c-0.33,0.33-0.73,0.496-1.202,0.496
c-0.473,0-0.873-0.166-1.203-0.496c-0.331-0.331-0.493-0.73-0.493-1.202v-14.151c0-1.251,0.234-2.424,0.705-3.52
c0.472-1.097,1.118-2.058,1.946-2.884c0.826-0.826,1.786-1.474,2.884-1.946c1.096-0.471,2.269-0.706,3.519-0.706
c1.251,0,2.423,0.235,3.521,0.706c1.097,0.473,2.057,1.12,2.883,1.946c0.825,0.826,1.475,1.787,1.946,2.884
C165.894,197.647,166.129,198.82,166.129,200.071 M162.733,200.071c0-0.779-0.148-1.51-0.442-2.192
c-0.297-0.685-0.702-1.286-1.221-1.805c-0.519-0.52-1.12-0.926-1.805-1.22c-0.685-0.296-1.416-0.443-2.193-0.443
c-0.778,0-1.509,0.147-2.193,0.443c-0.685,0.294-1.285,0.7-1.805,1.22c-0.519,0.519-0.926,1.12-1.22,1.805
c-0.295,0.683-0.442,1.413-0.442,2.192c0,0.778,0.147,1.51,0.442,2.193c0.294,0.684,0.701,1.286,1.22,1.805
c0.52,0.519,1.12,0.926,1.805,1.22c0.685,0.298,1.415,0.442,2.193,0.442c0.777,0,1.509-0.145,2.193-0.442
c0.685-0.294,1.286-0.701,1.805-1.22s0.924-1.121,1.221-1.805C162.585,201.581,162.733,200.85,162.733,200.071"/>
<path fill="#C91E60" d="M167.827,200.071c0-1.251,0.236-2.424,0.707-3.52c0.472-1.097,1.121-2.058,1.947-2.884
c0.824-0.826,1.785-1.474,2.882-1.946c1.098-0.471,2.271-0.706,3.521-0.706c1.249,0,2.424,0.235,3.519,0.706
c1.097,0.473,2.058,1.12,2.884,1.946c0.825,0.826,1.474,1.787,1.946,2.884c0.471,1.096,0.707,2.269,0.707,3.52
s-0.236,2.424-0.707,3.52c-0.473,1.099-1.121,2.059-1.946,2.885c-0.826,0.825-1.787,1.473-2.884,1.945
c-1.095,0.471-2.27,0.707-3.519,0.707c-1.251,0-2.424-0.236-3.521-0.707c-1.097-0.473-2.058-1.12-2.882-1.945
c-0.826-0.826-1.476-1.786-1.947-2.885C168.063,202.495,167.827,201.322,167.827,200.071 M171.224,200.071
c0,0.778,0.146,1.51,0.441,2.193c0.297,0.684,0.702,1.286,1.221,1.805s1.121,0.926,1.805,1.22
c0.684,0.298,1.415,0.442,2.194,0.442c0.776,0,1.508-0.145,2.191-0.442c0.686-0.294,1.286-0.701,1.806-1.22
c0.518-0.519,0.925-1.121,1.22-1.805c0.296-0.684,0.443-1.415,0.443-2.193c0-0.779-0.147-1.51-0.443-2.192
c-0.295-0.685-0.702-1.286-1.22-1.805c-0.52-0.52-1.12-0.926-1.806-1.22c-0.684-0.296-1.415-0.443-2.191-0.443
c-0.779,0-1.511,0.147-2.194,0.443c-0.684,0.294-1.286,0.7-1.805,1.22c-0.519,0.519-0.924,1.12-1.221,1.805
C171.37,198.562,171.224,199.292,171.224,200.071"/>
<path fill="#C91E60" d="M185.092,215.921c-0.472,0-0.873-0.166-1.204-0.496c-0.328-0.331-0.494-0.73-0.494-1.202
s0.166-0.873,0.494-1.203c0.331-0.331,0.732-0.495,1.204-0.495c0.944,0,1.746-0.33,2.405-0.99c0.66-0.662,0.991-1.463,0.991-2.406
v-16.415c0-0.471,0.164-0.871,0.496-1.202c0.327-0.33,0.729-0.495,1.201-0.495s0.875,0.165,1.204,0.495
c0.33,0.331,0.494,0.731,0.494,1.202v16.415c0,0.943-0.177,1.827-0.529,2.653c-0.354,0.825-0.838,1.545-1.452,2.157
c-0.613,0.613-1.332,1.099-2.157,1.451C186.919,215.743,186.036,215.921,185.092,215.921 M188.205,187.901
c0-0.542,0.195-1.008,0.583-1.396c0.389-0.39,0.854-0.584,1.397-0.584s1.008,0.194,1.397,0.584
c0.388,0.389,0.584,0.854,0.584,1.396c0,0.543-0.196,1.01-0.584,1.398c-0.39,0.388-0.854,0.583-1.397,0.583
s-1.009-0.195-1.397-0.583C188.4,188.911,188.205,188.444,188.205,187.901"/>
<path fill="#C91E60" d="M194.431,200.071c0-1.251,0.235-2.424,0.707-3.52c0.473-1.097,1.119-2.058,1.947-2.884
c0.824-0.826,1.783-1.474,2.883-1.946c1.097-0.471,2.27-0.706,3.519-0.706c1.25,0,2.425,0.235,3.522,0.706
c1.096,0.473,2.056,1.12,2.883,1.946c0.825,0.826,1.473,1.787,1.944,2.884c0.472,1.096,0.708,2.269,0.708,3.52
s-0.236,2.424-0.708,3.52c-0.472,1.099-1.119,2.059-1.944,2.885c-0.827,0.825-1.787,1.473-2.883,1.945
c-1.098,0.471-2.272,0.707-3.522,0.707c-1.249,0-2.422-0.236-3.519-0.707c-1.1-0.473-2.059-1.12-2.883-1.945
c-0.828-0.826-1.475-1.786-1.947-2.885C194.666,202.495,194.431,201.322,194.431,200.071 M197.827,200.071
c0,0.778,0.146,1.51,0.442,2.193c0.295,0.684,0.701,1.286,1.22,1.805c0.52,0.519,1.12,0.926,1.805,1.22
c0.684,0.298,1.415,0.442,2.192,0.442c0.779,0,1.511-0.145,2.194-0.442c0.684-0.294,1.284-0.701,1.803-1.22
s0.926-1.121,1.224-1.805c0.294-0.684,0.439-1.415,0.439-2.193c0-0.779-0.146-1.51-0.439-2.192
c-0.298-0.685-0.705-1.286-1.224-1.805c-0.519-0.52-1.119-0.926-1.803-1.22c-0.684-0.296-1.415-0.443-2.194-0.443
c-0.777,0-1.509,0.147-2.192,0.443c-0.685,0.294-1.285,0.7-1.805,1.22c-0.519,0.519-0.925,1.12-1.22,1.805
C197.974,198.562,197.827,199.292,197.827,200.071"/>
<path fill="#353E44" d="M213.941,207.714c0.389,0,0.706,0.317,0.706,0.707s-0.317,0.707-0.706,0.707
c-0.39,0-0.709-0.317-0.709-0.707S213.552,207.714,213.941,207.714"/>
<path fill="#353E44" d="M223.845,208.562c0,0.318-0.246,0.565-0.564,0.565c-0.319,0-0.568-0.247-0.568-0.565v-4.528
c0-1.556-1.272-2.83-2.828-2.83c-1.559,0-2.83,1.274-2.83,2.83v4.528c0,0.318-0.247,0.565-0.565,0.565
c-0.319,0-0.566-0.247-0.566-0.565v-4.528c0-2.192,1.77-3.962,3.962-3.962c1.433,0,2.705,0.778,3.396,1.929
c0.688-1.15,1.944-1.929,3.396-1.929c2.192,0,3.963,1.77,3.963,3.962v4.528c0,0.318-0.25,0.565-0.567,0.565
c-0.318,0-0.565-0.247-0.565-0.565v-4.528c0-1.556-1.274-2.83-2.83-2.83c-1.558,0-2.831,1.274-2.831,2.83V208.562z"/>
<path fill="#353E44" d="M236.441,209.128c-2.494,0-4.528-2.034-4.528-4.527s2.034-4.528,4.528-4.528
c2.492,0,4.525,2.035,4.525,4.528c0,0.318-0.248,0.565-0.563,0.565h-7.325c0.285,1.609,1.682,2.83,3.363,2.83h1.131
c0.317,0,0.567,0.248,0.567,0.566s-0.25,0.565-0.567,0.565H236.441z M233.078,204.034h6.705c-0.266-1.592-1.663-2.83-3.342-2.83
C234.76,201.204,233.363,202.442,233.078,204.034"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

230
classes/freemius/assets/scss/admin/connect.scss
View file

@ -4,53 +4,58 @@ $form_width: 480px;

#fs_connect
{
width: $form_width;
@include box-shadow(0px 1px 2px rgba(0,0,0,0.3));
width: $form_width;
@include box-shadow(0px 1px 2px rgba(0, 0, 0, 0.3));
margin: 20px 0;

@media screen and (max-width: ($form_width - 1)) {
@include box-shadow(none);
width: auto;
margin: 0 0 0 -10px;
width: auto;
margin: 0 0 0 -10px;
}

.fs-content
{
background: #fff;
padding: 15px 20px;
padding: 15px 20px;

p
{
margin: 0;
padding: 0;
margin: 0;
padding: 0;
font-size: 1.2em;
}
}

.fs-actions
{
padding: 10px 20px;
padding: 10px 20px;
background: #C0C7CA;

.button
{
padding: 0 10px 1px;
line-height: 35px;
height: 37px;
font-size: 16px;
padding: 0 10px 1px;
line-height: 35px;
height: 37px;
font-size: 16px;
margin-bottom: 0;

.dashicons
{
font-size: 37px;
margin-left: -8px;
font-size: 37px;
margin-left: -8px;
margin-right: 12px;
}

&.button-primary
{
padding-right: 15px;
padding-left: 15px;
padding-left: 15px;

&:after
{
content: ' \279C';
}
}

&.button-secondary
@ -59,13 +64,13 @@ $form_width: 480px;
}
}

// .fs-skip
// {
// line-height: 38px;
// vertical-align: middle;
// text-decoration: none;
// margin-left: 10px;
// }
// .fs-skip
// {
// line-height: 38px;
// vertical-align: middle;
// text-decoration: none;
// margin-left: 10px;
// }
}

&.fs-anonymous-disabled
@ -148,7 +153,7 @@ $form_width: 480px;
}

@media screen and (max-width: ($form_width - 1)) {
background: #fff;
background: #fff;

.fs-trigger
{
@ -169,31 +174,31 @@ $form_width: 480px;

.fs-visual
{
padding: 12px;
padding: 12px;
line-height: 0;
background: #fafafa;
height: $icon_size;
position: relative;
background: #fafafa;
height: $icon_size;
position: relative;

.fs-site-icon
{
position: absolute;
left: 20px;
top: $icons_top;
left: 20px;
top: $icons_top;
}

.fs-connect-logo
{
position: absolute;
right: 20px;
top: $icons_top;
right: 20px;
top: $icons_top;
}

.fs-plugin-icon
{
position: absolute;
top: $icons_top;
left: 50%;
position: absolute;
top: $icons_top;
left: 50%;
margin-left: - ($icon_size / 2);
}

@ -218,11 +223,11 @@ $form_width: 480px;

.dashicons-plus
{
position: absolute;
top: 50%;
font-size: 30px;
position: absolute;
top: 50%;
font-size: 30px;
margin-top: -10px;
color: #bbb;
color: #bbb;

&.fs-first
{
@ -238,8 +243,8 @@ $form_width: 480px;
.fs-connect-logo,
.fs-site-icon
{
border: 1px solid #ccc;
padding: 1px;
border: 1px solid #ccc;
padding: 1px;
background: #fff;
}
}
@ -247,17 +252,154 @@ $form_width: 480px;
.fs-terms
{
text-align: center;
font-size: 0.85em;
padding: 5px;
background: rgba(0,0,0,0.05);
font-size: 0.85em;
padding: 5px;
background: rgba(0, 0, 0, 0.05);

&, a
{
color: #999;
}

a {
a
{
text-decoration: none;
}
}
}

.rtl
{
#fs_connect
{
.fs-actions
{
padding: 10px 20px;
background: #C0C7CA;

.button
{
.dashicons
{
font-size: 37px;
margin-left: -8px;
margin-right: 12px;
}

&.button-primary
{
&:after
{
content: ' \000bb';
}
}

&.button-secondary
{
float: left;
}
}
}

.fs-permissions
{
ul
{
li
{
div
{
margin-right: 55px;
margin-left: 0;
}

i.dashicons
{
float: right;
}

}
}
}

.fs-visual
{
.fs-site-icon
{
right: 20px;
left: auto;
}

.fs-connect-logo
{
right: auto;
left: 20px;
}
}
}
}

.wp-pointer-content
{
#fs_connect
{
margin: 0;
@include box-shadow(none);
}
}

.fs-opt-in-pointer
{
.wp-pointer-content
{
padding: 0;
}

&.wp-pointer-top
{
.wp-pointer-arrow
{
border-bottom-color: #dfdfdf;
}
.wp-pointer-arrow-inner
{
border-bottom-color: #fafafa;
}
}

&.wp-pointer-bottom
{
.wp-pointer-arrow
{
border-top-color: #dfdfdf;
}
.wp-pointer-arrow-inner
{
border-top-color: #fafafa;
}
}

&.wp-pointer-left
{
.wp-pointer-arrow
{
border-right-color: #dfdfdf;
}
.wp-pointer-arrow-inner
{
border-right-color: #fafafa;
}
}

&.wp-pointer-right
{
.wp-pointer-arrow
{
border-left-color: #dfdfdf;
}
.wp-pointer-arrow-inner
{
border-left-color: #fafafa;
}
}
}

2
classes/freemius/config.php
View file

@ -39,7 +39,7 @@
*/
if ( ! defined( 'WP_FS__LOCALHOST_IP' ) ) {
// VVV default public network IP.
define( 'WP_FS__VVV_DEFAULT_PUBLIC_IP', '192.168.50.4' );
define( 'WP_FS__VVV_DEFAULT_PUBLIC_IP', '192.168.50.1' );

// define( 'WP_FS__LOCALHOST_IP', WP_FS__VVV_DEFAULT_PUBLIC_IP );
}

10
classes/freemius/includes/class-freemius-abstract.php
View file

@ -336,6 +336,16 @@
*/
abstract function get_upgrade_url( $period = WP_FS__PERIOD_ANNUALLY );

/**
* Check if Freemius was first added in a plugin update.
*
* @author Vova Feldman (@svovaf)
* @since 1.1.5
*
* @return bool
*/
abstract function is_plugin_update();

#region Marketing ------------------------------------------------------------------

/**

51
classes/freemius/includes/class-freemius.php
View file

@ -939,7 +939,7 @@

if (isset( $this->_storage->connectivity_test ) ) {
if ( $_SERVER['HTTP_HOST'] == $this->_storage->connectivity_test['host'] &&
$_SERVER['SERVER_ADDR'] == $this->_storage->connectivity_test['server_ip']
fs_get_ip() == $this->_storage->connectivity_test['server_ip']
) {
if ( ( $this->_storage->connectivity_test['is_connected'] &&
$this->_storage->connectivity_test['is_active'] ) ||
@ -954,7 +954,7 @@
}
}

$is_update = $this->apply_filters( 'is_plugin_update', !$this->is_plugin_new_install() );
$is_update = $this->apply_filters( 'is_plugin_update', $this->is_plugin_update() );

if ( WP_FS__SIMULATE_NO_API_CONNECTIVITY ) {
$is_connected = false;
@ -982,7 +982,7 @@
$this->_storage->connectivity_test = array(
'is_connected' => $is_connected,
'host' => $_SERVER['HTTP_HOST'],
'server_ip' => $_SERVER['SERVER_ADDR'],
'server_ip' => fs_get_ip(),
'is_active' => $is_active,
'timestamp' => WP_FS__SCRIPT_START_TIME,
// Last version with connectivity attempt.
@ -1387,6 +1387,8 @@
);
}

$server_ip = fs_get_ip();

// Generate the default email sections.
$sections = array(
'sdk' => array(
@ -1413,7 +1415,7 @@
),
'server_addr' => array(
'SERVER_ADDR',
( ! empty( $_SERVER['SERVER_ADDR'] ) ? '<a href="http://www.projecthoneypot.org/ip_' . $_SERVER['SERVER_ADDR'] . '">' . $_SERVER['SERVER_ADDR'] . '</a>' : '' )
'<a href="http://www.projecthoneypot.org/ip_' . $server_ip . '">' . $server_ip . '</a>'
)
)
),
@ -2383,6 +2385,16 @@
$this->_storage->is_plugin_new_install;
}

/**
* @author Vova Feldman (@svovaf)
* @since 1.1.5
*
* @return bool
*/
function is_plugin_update() {
return ! $this->is_plugin_new_install();
}

/**
* Plugin activated hook.
*
@ -2549,6 +2561,9 @@
'timestamp' => WP_FS__SCRIPT_START_TIME,
'version' => $this->get_plugin_version(),
);

// Update anonymous mode cache.
$this->_is_anonymous = $is_anonymous;
}

/**
@ -4755,6 +4770,11 @@
);
}

$show_pricing = ($this->has_paid_plan() && $this->_menu->is_submenu_item_visible( 'pricing' ));
// If user don't have paid plans, add pricing page
// to support add-ons checkout but don't add the submenu item.
// || (isset( $_GET['page'] ) && $this->_menu->get_slug( 'pricing' ) == $_GET['page']);

// Add upgrade/pricing page.
$this->add_submenu_item(
( $this->is_paying() ? __fs( 'pricing' ) : __fs( 'upgrade' ) . '&nbsp;&nbsp;&#x27a4;' ),
@ -4764,9 +4784,7 @@
'pricing',
array( &$this, '_clean_admin_content_section' ),
WP_FS__LOWEST_PRIORITY,
// If user don't have paid plans, add pricing page
// to support add-ons checkout but don't add the submenu item.
$this->_menu->is_submenu_item_visible( 'pricing' ) && ( $this->has_paid_plan() || ( isset( $_GET['page'] ) && $this->_menu->get_slug( 'pricing' ) == $_GET['page'] ) )
$show_pricing
);
}
}
@ -4883,8 +4901,8 @@
if ( $this->is_registered() ) {
if ( $this->_menu->is_submenu_item_visible( 'support' ) ) {
$this->add_submenu_link_item(
__fs( 'support-forum' ),
'https://wordpress.org/support/plugin/' . $this->_slug,
$this->apply_filters( 'support_forum_submenu', __fs( 'support-forum' ) ),
$this->apply_filters( 'support_forum_url', 'https://wordpress.org/support/plugin/' . $this->_slug ),
'wp-support-forum',
'read',
50
@ -5092,6 +5110,21 @@
add_filter( 'fs_' . $tag . '_' . $this->_slug, $function_to_add, $priority, $accepted_args );
}

/**
* Check if has filter.
*
* @author Vova Feldman (@svovaf)
* @since 1.1.4
*
* @param string $tag
* @param callable|bool $function_to_check Optional. The callback to check for. Default false.
*/
function has_filter( $tag, $function_to_check = false ) {
$this->_logger->entrance( $tag );

return has_filter( 'fs_' . $tag . '_' . $this->_slug, $function_to_check );
}

/* Account Page
------------------------------------------------------------------------------------------------------------------*/
/**

12
classes/freemius/includes/i18n.php
View file

@ -11,7 +11,7 @@
'add-ons' => __( 'Add Ons', 'freemius' ),
'upgrade' => _x( 'Upgrade', 'verb', 'freemius' ),
'awesome' => __( 'Awesome', 'freemius' ),
'pricing' => __( 'Pricing', 'noun', 'freemius' ),
'pricing' => _x( 'Pricing', 'noun', 'freemius' ),
'price' => _x( 'Price', 'noun', 'freemius' ),
'unlimited-updates' => __( 'Unlimited Updates', 'freemius' ),
'downgrade' => _x( 'Downgrade', 'verb', 'freemius' ),
@ -20,7 +20,7 @@
'account-details' => __( 'Account Details', 'freemius' ),
'delete' => _x( 'Delete', 'verb', 'freemius' ),
'delete-account' => __( 'Delete Account', 'freemius' ),
'dismiss' => __( 'Dismiss', 'as close a window', 'freemius' ),
'dismiss' => _x( 'Dismiss', 'as close a window', 'freemius' ),
'plan' => _x( 'Plan', 'as product pricing plan', 'freemius' ),
'change-plan' => __( 'Change Plan', 'freemius' ),
'download-x-version' => _x( 'Download %s Version', 'as download professional version', 'freemius' ),
@ -217,12 +217,12 @@
'x-requires-access-to-api' => _x( '%s requires an access to our API.', 'as pluginX requires an access to our API', 'freemius' ),
'squid-blocks-connection-message' => __( 'It looks like your server is using Squid ACL (access control lists), which blocks the connection.', 'freemius' ),
'squid-no-clue-title' => __( 'I don\'t know what is Squid or ACL, help me!', 'freemius' ),
'squid-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.' ),
'squid-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.', 'freemius' ),
'sysadmin-title' => __( 'I\'m a system administrator', 'freemius' ),
'squid-sysadmin-desc' => __( 'Great, please whitelist the following domains: %s. Once you done, deactivate the plugin and activate it again.' ),
'squid-sysadmin-desc' => __( 'Great, please whitelist the following domains: %s. Once you done, deactivate the plugin and activate it again.', 'freemius' ),
'curl-missing-no-clue-title' => __( 'I don\'t know what is cURL or how to install it, help me!', 'freemius' ),
'curl-missing-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.' ),
'curl-missing-sysadmin-desc' => __( 'Great, please install cURL and enable it in your php.ini file. To make sure it was successfully activated, use \'phpinfo()\'. Once activated, deactivate the plugin and reactivate it back again.' ),
'curl-missing-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.', 'freemius' ),
'curl-missing-sysadmin-desc' => __( 'Great, please install cURL and enable it in your php.ini file. To make sure it was successfully activated, use \'phpinfo()\'. Once activated, deactivate the plugin and reactivate it back again.', 'freemius' ),
'happy-to-resolve-issue-asap' => __( 'We are sure it\'s an issue on our side and more than happy to resolve it for you ASAP if you give us a chance.', 'freemius' ),
'fix-issue-title' => __( 'Yes - I\'m giving you a chance to fix it', 'freemius' ),
'fix-issue-desc' => __( 'We will do our best to whitelist your server and resolve this issue ASAP. You will get a follow-up email to %s once we have an update.', 'freemius' ),

29
classes/freemius/templates/connect.php
View file

@ -6,8 +6,8 @@
* @since 1.0.7
*/

$slug = $VARS['slug'];
$fs = freemius( $slug );
$slug = $VARS['slug'];
$fs = freemius( $slug );

$fs->_enqueue_connect_essentials();

@ -44,15 +44,22 @@
</div>
<div class="fs-content">
<p><?php
echo $fs->apply_filters( 'connect_message', sprintf(
__fs( 'hey-x' ) . '<br>' .
__fs( 'connect-message' ),
echo $fs->apply_filters( 'connect_message',
sprintf(
__fs( 'hey-x' ) . '<br>' .
__fs( 'connect-message' ),
$first_name,
'<b>' . $fs->get_plugin_name() . '</b>',
'<b>' . $current_user->user_login . '</b>',
'<a href="' . $site_url . '" target="_blank">' . $site_url . '</a>',
'<a href="' . $freemius_site_url . '" target="_blank">freemius.com</a>'
),
$first_name,
'<b>' . $fs->get_plugin_name() . '</b>',
'<b>' . $current_user->user_login . '</b>',
$fs->get_plugin_name(),
$current_user->user_login,
'<a href="' . $site_url . '" target="_blank">' . $site_url . '</a>',
'<a href="' . $freemius_site_url . '" target="_blank">freemius.com</a>'
) );
);
?></p>
</div>
<div class="fs-actions">
@ -66,8 +73,7 @@
<input type="hidden" name="fs_action" value="<?php echo $slug ?>_activate_existing">
<?php wp_nonce_field( 'activate_existing_' . $fs->get_public_key() ) ?>
<button class="button button-primary" tabindex="1"
type="submit"><?php _efs( 'opt-in-connect' ) ?>
&nbsp;&#10140;</button>
type="submit"><?php _efs( 'opt-in-connect' ) ?></button>
</form>
<?php else : ?>
<form method="post" action="<?php echo WP_FS__ADDRESS ?>/action/service/user/install/">
@ -118,8 +124,7 @@
<input type="hidden" name="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>">
<?php endforeach ?>
<button class="button button-primary" tabindex="1"
type="submit"><?php _efs( 'opt-in-connect' ) ?>
&nbsp;&#10140;</button>
type="submit"><?php _efs( 'opt-in-connect' ) ?></button>
</form>
<?php endif ?>
</div>

14
language/aryo-activity-log.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aryo-activity-log 2.2.6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-14 14:57+0200\n"
"POT-Creation-Date: 2016-01-04 18:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -22,6 +22,16 @@ msgstr ""
msgid "Cheatin&#8217; huh?"
msgstr ""

#: aryo-activity-log.php:174
#, php-format
msgid ""
"<b>Please help us improve %1$s!</b><br>\n"
"\t\t \tIf you opt-in, some data about your usage of <b>%1$s</b> will be "
"sent to %2$s.\n"
"\t\t \tIf you skip this, that's okay! <b>%1$s</b> will still work just "
"fine."
msgstr ""

#: classes/class-aal-activity-log-list-table.php:104
msgid "Activities"
msgstr ""
@ -446,6 +456,7 @@ msgid "Awesome"
msgstr ""

#: classes/freemius/includes/i18n.php:14
msgctxt "noun"
msgid "Pricing"
msgstr ""

@ -485,6 +496,7 @@ msgid "Delete Account"
msgstr ""

#: classes/freemius/includes/i18n.php:23
msgctxt "as close a window"
msgid "Dismiss"
msgstr ""