MailMunch – Grow your Email List - Version 2.0.2

Version Description

Download this release

Release Info

Developer mailmunch
Plugin Icon 128x128 MailMunch – Grow your Email List
Version 2.0.2
Comparing to
See all releases

Code changes from version 2.0.1 to 2.0.2

Files changed (10) hide show
  1. admin/class-mailmunch-admin.php +65 -7
  2. admin/css/mailmunch-admin.css +65 -543
  3. admin/img/logo.png +0 -0
  4. admin/partials/mailmunch-modals.php +20 -20
  5. includes/class-mailmunch-activator.php +1 -1
  6. includes/class-mailmunch-deactivator.php +1 -1
  7. includes/class-mailmunch.php +10 -4
  8. mailmunch.php +1 -1
  9. readme.txt +3 -3
  10. uninstall.php +4 -1
admin/class-mailmunch-admin.php CHANGED
@@ -148,16 +148,74 @@ class Mailmunch_Admin {
148
  }
149
 
150
  /**
151
- * Activation notice for admin area
152
  *
153
- * @since 2.0.8
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
154
  */
155
- function activation_notice() {
156
- $current_screen = get_current_screen();
157
- $siteId = get_option(MAILMUNCH_PREFIX. '_'. 'site_id');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
158
 
159
- if (empty($siteId) && strpos($current_screen->id, MAILMUNCH_SLUG) == false) {
160
- echo '<div class="updated"><p>'.$this->plugin_name.' is activated. <a href="admin.php?page='.MAILMUNCH_SLUG.'">Click here</a> to create your first form.</p></div>';
 
 
 
 
 
 
161
  }
162
  }
163
 
148
  }
149
 
150
  /**
151
+ * Activation redirect for admin area
152
  *
153
+ * @since 2.0.2
154
+ */
155
+ public function activation_redirect() {
156
+ if (get_option(MAILMUNCH_PREFIX. '_activation_redirect', 'true') == 'true') {
157
+ update_option(MAILMUNCH_PREFIX. '_activation_redirect', 'false');
158
+ wp_redirect(esc_url(admin_url('admin.php?page='. MAILMUNCH_SLUG)));
159
+ exit();
160
+ }
161
+ }
162
+
163
+ /**
164
+ * Check and store installation/activation date
165
+ *
166
+ * @since 2.0.2
167
+ */
168
+ public function check_installation_date() {
169
+ $activation_date = get_option( MAILMUNCH_PREFIX. '_activation_date' );
170
+ if (!$activation_date) {
171
+ add_option( MAILMUNCH_PREFIX. '_activation_date', strtotime( "now" ) );
172
+ }
173
+ }
174
+
175
+ /**
176
+ * Review notice after two weeks of usage
177
+ *
178
+ * @since 2.0.2
179
  */
180
+ public function review_us_notice() {
181
+ $show_notice = true;
182
+ $past_date = strtotime( '-14 days' );
183
+ $activation_date = get_option( MAILMUNCH_PREFIX. '_activation_date' );
184
+ $notice_dismissed = get_option( MAILMUNCH_PREFIX. '_dismiss_review_notice' );
185
+ if ($notice_dismissed == 'true') {
186
+ $show_notice = false;
187
+ } elseif (!in_array(get_current_screen()->base , array( 'dashboard' , 'post' , 'edit' )) && strpos(get_current_screen()->base , MAILMUNCH_SLUG) == false) {
188
+ $show_notice = false;
189
+ } elseif (!current_user_can( 'install_plugins' )) {
190
+ $show_notice = false;
191
+ } elseif ( !$activation_date || $past_date < $activation_date ) {
192
+ $show_notice = false;
193
+ }
194
+ if ($show_notice) {
195
+ $review_url = 'https://wordpress.org/support/view/plugin-reviews/'. MAILMUNCH_PLUGIN_DIRECTORY;
196
+ $dismiss_url = esc_url_raw( add_query_arg( MAILMUNCH_PREFIX. '_dismiss_review_notice', '1', admin_url() ) );
197
+ $review_message = '<div class="mailmunch-review-logo"><img src="'.plugins_url( 'admin/img/logo.png', dirname(__FILE__) ) .'" /></div>';
198
+ $review_message .= sprintf( __( "You have been using <strong>%s</strong> for a few weeks now. We hope you are enjoying the features. Please consider leaving us a nice review. Reviews help people find our plugin and lets you provide us with useful feedback which helps us improve." , MAILMUNCH_SLUG ), $this->plugin_name );
199
+ $review_message .= "<div class='mailmunch-buttons'>";
200
+ $review_message .= sprintf( "<a href='%s' target='_blank' class='button-secondary'><span class='dashicons dashicons-star-filled'></span>" . __( "Leave a Review" , MAILMUNCH_SLUG ) . "</a>", $review_url );
201
+ $review_message .= sprintf( "<a href='%s' class='button-secondary'><span class='dashicons dashicons-no-alt'></span>" . __( "Dismiss" , MAILMUNCH_SLUG ) . "</a>", $dismiss_url );
202
+ $review_message .= "</div>";
203
+ ?>
204
+ <div class="mailmunch-review-notice">
205
+ <?php echo $review_message; ?>
206
+ </div>
207
+ <?php
208
+ }
209
+ }
210
 
211
+ /**
212
+ * Dismiss review notice
213
+ *
214
+ * @since 2.0.2
215
+ */
216
+ public function dismiss_review_notice() {
217
+ if ( isset( $_GET[MAILMUNCH_PREFIX. '_dismiss_review_notice'] ) ) {
218
+ add_option( MAILMUNCH_PREFIX. '_dismiss_review_notice', 'true' );
219
  }
220
  }
221
 
admin/css/mailmunch-admin.css CHANGED
@@ -204,37 +204,6 @@
204
  .alert > p + p {
205
  margin-top: 5px;
206
  }
207
- .alert-dismissable {
208
- padding-right: 35px;
209
- }
210
- .alert-dismissable .close {
211
- position: relative;
212
- top: -2px;
213
- right: -21px;
214
- color: inherit;
215
- }
216
- .alert-success {
217
- color: #3c763d;
218
- background-color: #dff0d8;
219
- border-color: #d6e9c6;
220
- }
221
- .alert-success hr {
222
- border-top-color: #c9e2b3;
223
- }
224
- .alert-success .alert-link {
225
- color: #2b542c;
226
- }
227
- .alert-info {
228
- color: #31708f;
229
- background-color: #d9edf7;
230
- border-color: #bce8f1;
231
- }
232
- .alert-info hr {
233
- border-top-color: #a6e1ec;
234
- }
235
- .alert-info .alert-link {
236
- color: #245269;
237
- }
238
  .alert-warning {
239
  color: #8a6d3b;
240
  background-color: #fcf8e3;
@@ -258,49 +227,12 @@
258
  color: #843534;
259
  }
260
 
261
- label {
262
  display: inline-block;
263
  margin-bottom: 5px;
264
  font-weight: bold;
265
  }
266
- input[type="search"] {
267
- -webkit-box-sizing: border-box;
268
- -moz-box-sizing: border-box;
269
- box-sizing: border-box;
270
- }
271
- input[type="radio"],
272
- input[type="checkbox"] {
273
- margin: 4px 0 0;
274
- margin-top: 1px \9;
275
- /* IE8-9 */
276
- line-height: normal;
277
- }
278
- input[type="file"] {
279
- display: block;
280
- }
281
- input[type="range"] {
282
- display: block;
283
- width: 100%;
284
- }
285
- select[multiple],
286
- select[size] {
287
- height: auto;
288
- }
289
- input[type="file"]:focus,
290
- input[type="radio"]:focus,
291
- input[type="checkbox"]:focus {
292
- outline: thin dotted;
293
- outline: 5px auto -webkit-focus-ring-color;
294
- outline-offset: -2px;
295
- }
296
- output {
297
- display: block;
298
- padding-top: 7px;
299
- font-size: 14px;
300
- line-height: 1.42857143;
301
- color: #555;
302
- }
303
- .form-control {
304
  display: block;
305
  width: 400px;
306
  height: 34px;
@@ -317,128 +249,28 @@ output {
317
  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
318
  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
319
  }
320
- .form-control:focus {
321
  border-color: #66afe9;
322
  outline: 0;
323
  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
324
  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
325
  }
326
- .form-control::-moz-placeholder {
327
  color: #999;
328
  opacity: 1;
329
  }
330
- .form-control:-ms-input-placeholder {
331
  color: #999;
332
  }
333
- .form-control::-webkit-input-placeholder {
334
  color: #999;
335
  }
336
- .form-control[disabled],
337
- .form-control[readonly],
338
- fieldset[disabled] .form-control {
339
- cursor: not-allowed;
340
- background-color: #eee;
341
- opacity: 1;
342
- }
343
- textarea.form-control {
344
- height: auto;
345
- }
346
- input[type="search"] {
347
- -webkit-appearance: none;
348
- }
349
- input[type="date"] {
350
- line-height: 34px;
351
- }
352
- .form-group {
353
  margin-bottom: 15px;
354
  }
355
- .radio,
356
- .checkbox {
357
- display: block;
358
- min-height: 20px;
359
- padding-left: 20px;
360
- margin-top: 10px;
361
- margin-bottom: 10px;
362
- }
363
- .radio label,
364
- .checkbox label {
365
- display: inline;
366
- font-weight: normal;
367
- cursor: pointer;
368
- }
369
- .radio input[type="radio"],
370
- .radio-inline input[type="radio"],
371
- .checkbox input[type="checkbox"],
372
- .checkbox-inline input[type="checkbox"] {
373
- float: left;
374
- margin-left: -20px;
375
- }
376
- .radio + .radio,
377
- .checkbox + .checkbox {
378
- margin-top: -5px;
379
- }
380
- .radio-inline,
381
- .checkbox-inline {
382
- display: inline-block;
383
- padding-left: 20px;
384
- margin-bottom: 0;
385
- font-weight: normal;
386
- vertical-align: middle;
387
- cursor: pointer;
388
- }
389
- .radio-inline + .radio-inline,
390
- .checkbox-inline + .checkbox-inline {
391
- margin-top: 0;
392
- margin-left: 10px;
393
- }
394
- input[type="radio"][disabled],
395
- input[type="checkbox"][disabled],
396
- .radio[disabled],
397
- .radio-inline[disabled],
398
- .checkbox[disabled],
399
- .checkbox-inline[disabled],
400
- fieldset[disabled] input[type="radio"],
401
- fieldset[disabled] input[type="checkbox"],
402
- fieldset[disabled] .radio,
403
- fieldset[disabled] .radio-inline,
404
- fieldset[disabled] .checkbox,
405
- fieldset[disabled] .checkbox-inline {
406
- cursor: not-allowed;
407
- }
408
- .input-sm {
409
- height: 30px;
410
- padding: 5px 10px;
411
- font-size: 12px;
412
- line-height: 1.5;
413
- border-radius: 3px;
414
- }
415
- select.input-sm {
416
- height: 30px;
417
- line-height: 30px;
418
- }
419
- textarea.input-sm,
420
- select[multiple].input-sm {
421
- height: auto;
422
- }
423
- .input-lg {
424
- height: 46px;
425
- padding: 10px 16px;
426
- font-size: 18px;
427
- line-height: 1.33;
428
- border-radius: 6px;
429
- }
430
- select.input-lg {
431
- height: 46px;
432
- line-height: 46px;
433
- }
434
- textarea.input-lg,
435
- select[multiple].input-lg {
436
- height: auto;
437
- }
438
-
439
 
440
- }
441
- .btn {
442
  display: inline-block;
443
  padding: 6px 12px;
444
  margin-bottom: 0;
@@ -458,413 +290,103 @@ select[multiple].input-lg {
458
  border-radius: 4px;
459
  text-decoration: none;
460
  }
461
- .btn:focus,
462
- .btn:active:focus,
463
- .btn.active:focus {
464
  outline: thin dotted;
465
  outline: 5px auto -webkit-focus-ring-color;
466
  outline-offset: -2px;
467
  }
468
- .btn:hover,
469
- .btn:focus {
470
  color: #333;
471
  text-decoration: none;
472
  }
473
- .btn:active,
474
- .btn.active {
475
  background-image: none;
476
  outline: 0;
477
  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
478
  box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
479
  }
480
- .btn.disabled,
481
- .btn[disabled],
482
- fieldset[disabled] .btn {
483
- pointer-events: none;
484
- cursor: not-allowed;
485
- filter: alpha(opacity=65);
486
- -webkit-box-shadow: none;
487
- box-shadow: none;
488
- opacity: .65;
489
- }
490
- .btn-default {
491
- color: #333;
492
- background-color: #fff;
493
- border-color: #ccc;
494
- }
495
- .btn-default:hover,
496
- .btn-default:focus,
497
- .btn-default:active,
498
- .btn-default.active,
499
- .open .dropdown-toggle.btn-default {
500
- color: #333;
501
- background-color: #ebebeb;
502
- border-color: #adadad;
503
- }
504
- .btn-default:active,
505
- .btn-default.active,
506
- .open .dropdown-toggle.btn-default {
507
- background-image: none;
508
- }
509
- .btn-default.disabled,
510
- .btn-default[disabled],
511
- fieldset[disabled] .btn-default,
512
- .btn-default.disabled:hover,
513
- .btn-default[disabled]:hover,
514
- fieldset[disabled] .btn-default:hover,
515
- .btn-default.disabled:focus,
516
- .btn-default[disabled]:focus,
517
- fieldset[disabled] .btn-default:focus,
518
- .btn-default.disabled:active,
519
- .btn-default[disabled]:active,
520
- fieldset[disabled] .btn-default:active,
521
- .btn-default.disabled.active,
522
- .btn-default[disabled].active,
523
- fieldset[disabled] .btn-default.active {
524
- background-color: #fff;
525
- border-color: #ccc;
526
- }
527
- .btn-default .badge {
528
- color: #fff;
529
- background-color: #333;
530
- }
531
- .btn-primary {
532
- color: #fff;
533
- background-color: #428bca;
534
- border-color: #357ebd;
535
- }
536
- .btn-primary:hover,
537
- .btn-primary:focus,
538
- .btn-primary:active,
539
- .btn-primary.active,
540
- .open .dropdown-toggle.btn-primary {
541
- color: #fff;
542
- background-color: #3276b1;
543
- border-color: #285e8e;
544
- }
545
- .btn-primary:active,
546
- .btn-primary.active,
547
- .open .dropdown-toggle.btn-primary {
548
- background-image: none;
549
- }
550
- .btn-primary.disabled,
551
- .btn-primary[disabled],
552
- fieldset[disabled] .btn-primary,
553
- .btn-primary.disabled:hover,
554
- .btn-primary[disabled]:hover,
555
- fieldset[disabled] .btn-primary:hover,
556
- .btn-primary.disabled:focus,
557
- .btn-primary[disabled]:focus,
558
- fieldset[disabled] .btn-primary:focus,
559
- .btn-primary.disabled:active,
560
- .btn-primary[disabled]:active,
561
- fieldset[disabled] .btn-primary:active,
562
- .btn-primary.disabled.active,
563
- .btn-primary[disabled].active,
564
- fieldset[disabled] .btn-primary.active {
565
- background-color: #428bca;
566
- border-color: #357ebd;
567
- }
568
- .btn-primary .badge {
569
- color: #428bca;
570
- background-color: #fff;
571
- }
572
- .btn-success {
573
  color: #fff;
574
  background-color: #5cb85c;
575
  border-color: #4cae4c;
576
  }
577
- .btn-success:hover,
578
- .btn-success:focus,
579
- .btn-success:active,
580
- .btn-success.active,
581
- .open .dropdown-toggle.btn-success {
582
  color: #fff;
583
  background-color: #47a447;
584
  border-color: #398439;
585
  }
586
- .btn-success:active,
587
- .btn-success.active,
588
- .open .dropdown-toggle.btn-success {
589
  background-image: none;
590
  }
591
- .btn-success.disabled,
592
- .btn-success[disabled],
593
- fieldset[disabled] .btn-success,
594
- .btn-success.disabled:hover,
595
- .btn-success[disabled]:hover,
596
- fieldset[disabled] .btn-success:hover,
597
- .btn-success.disabled:focus,
598
- .btn-success[disabled]:focus,
599
- fieldset[disabled] .btn-success:focus,
600
- .btn-success.disabled:active,
601
- .btn-success[disabled]:active,
602
- fieldset[disabled] .btn-success:active,
603
- .btn-success.disabled.active,
604
- .btn-success[disabled].active,
605
- fieldset[disabled] .btn-success.active {
606
- background-color: #5cb85c;
607
- border-color: #4cae4c;
608
- }
609
- .btn-success .badge {
610
  color: #5cb85c;
611
  background-color: #fff;
612
  }
613
- .btn-info {
614
- color: #fff;
615
- background-color: #5bc0de;
616
- border-color: #46b8da;
617
- }
618
- .btn-info:hover,
619
- .btn-info:focus,
620
- .btn-info:active,
621
- .btn-info.active,
622
- .open .dropdown-toggle.btn-info {
623
- color: #fff;
624
- background-color: #39b3d7;
625
- border-color: #269abc;
626
- }
627
- .btn-info:active,
628
- .btn-info.active,
629
- .open .dropdown-toggle.btn-info {
630
- background-image: none;
631
- }
632
- .btn-info.disabled,
633
- .btn-info[disabled],
634
- fieldset[disabled] .btn-info,
635
- .btn-info.disabled:hover,
636
- .btn-info[disabled]:hover,
637
- fieldset[disabled] .btn-info:hover,
638
- .btn-info.disabled:focus,
639
- .btn-info[disabled]:focus,
640
- fieldset[disabled] .btn-info:focus,
641
- .btn-info.disabled:active,
642
- .btn-info[disabled]:active,
643
- fieldset[disabled] .btn-info:active,
644
- .btn-info.disabled.active,
645
- .btn-info[disabled].active,
646
- fieldset[disabled] .btn-info.active {
647
- background-color: #5bc0de;
648
- border-color: #46b8da;
649
- }
650
- .btn-info .badge {
651
- color: #5bc0de;
652
- background-color: #fff;
653
- }
654
- .btn-warning {
655
- color: #fff;
656
- background-color: #f0ad4e;
657
- border-color: #eea236;
658
- }
659
- .btn-warning:hover,
660
- .btn-warning:focus,
661
- .btn-warning:active,
662
- .btn-warning.active,
663
- .open .dropdown-toggle.btn-warning {
664
- color: #fff;
665
- background-color: #ed9c28;
666
- border-color: #d58512;
667
- }
668
- .btn-warning:active,
669
- .btn-warning.active,
670
- .open .dropdown-toggle.btn-warning {
671
- background-image: none;
672
- }
673
- .btn-warning.disabled,
674
- .btn-warning[disabled],
675
- fieldset[disabled] .btn-warning,
676
- .btn-warning.disabled:hover,
677
- .btn-warning[disabled]:hover,
678
- fieldset[disabled] .btn-warning:hover,
679
- .btn-warning.disabled:focus,
680
- .btn-warning[disabled]:focus,
681
- fieldset[disabled] .btn-warning:focus,
682
- .btn-warning.disabled:active,
683
- .btn-warning[disabled]:active,
684
- fieldset[disabled] .btn-warning:active,
685
- .btn-warning.disabled.active,
686
- .btn-warning[disabled].active,
687
- fieldset[disabled] .btn-warning.active {
688
- background-color: #f0ad4e;
689
- border-color: #eea236;
690
- }
691
- .btn-warning .badge {
692
- color: #f0ad4e;
693
- background-color: #fff;
694
- }
695
- .btn-danger {
696
- color: #fff;
697
- background-color: #d9534f;
698
- border-color: #d43f3a;
699
- }
700
- .btn-danger:hover,
701
- .btn-danger:focus,
702
- .btn-danger:active,
703
- .btn-danger.active,
704
- .open .dropdown-toggle.btn-danger {
705
- color: #fff;
706
- background-color: #d2322d;
707
- border-color: #ac2925;
708
- }
709
- .btn-danger:active,
710
- .btn-danger.active,
711
- .open .dropdown-toggle.btn-danger {
712
- background-image: none;
713
- }
714
- .btn-danger.disabled,
715
- .btn-danger[disabled],
716
- fieldset[disabled] .btn-danger,
717
- .btn-danger.disabled:hover,
718
- .btn-danger[disabled]:hover,
719
- fieldset[disabled] .btn-danger:hover,
720
- .btn-danger.disabled:focus,
721
- .btn-danger[disabled]:focus,
722
- fieldset[disabled] .btn-danger:focus,
723
- .btn-danger.disabled:active,
724
- .btn-danger[disabled]:active,
725
- fieldset[disabled] .btn-danger:active,
726
- .btn-danger.disabled.active,
727
- .btn-danger[disabled].active,
728
- fieldset[disabled] .btn-danger.active {
729
- background-color: #d9534f;
730
- border-color: #d43f3a;
731
- }
732
- .btn-danger .badge {
733
- color: #d9534f;
734
- background-color: #fff;
735
- }
736
- .btn-link {
737
- font-weight: normal;
738
- color: #428bca;
739
- cursor: pointer;
740
- border-radius: 0;
741
- }
742
- .btn-link,
743
- .btn-link:active,
744
- .btn-link[disabled],
745
- fieldset[disabled] .btn-link {
746
- background-color: transparent;
747
- -webkit-box-shadow: none;
748
- box-shadow: none;
749
- }
750
- .btn-link,
751
- .btn-link:hover,
752
- .btn-link:focus,
753
- .btn-link:active {
754
- border-color: transparent;
755
- }
756
- .btn-link:hover,
757
- .btn-link:focus {
758
- color: #2a6496;
759
- text-decoration: underline;
760
- background-color: transparent;
761
- }
762
- .btn-link[disabled]:hover,
763
- fieldset[disabled] .btn-link:hover,
764
- .btn-link[disabled]:focus,
765
- fieldset[disabled] .btn-link:focus {
766
- color: #999;
767
- text-decoration: none;
768
- }
769
- .btn-lg,
770
- .btn-group-lg > .btn {
771
  padding: 10px 16px;
772
  font-size: 18px;
773
  line-height: 1.33;
774
  border-radius: 6px;
775
  text-decoration: none;
776
  }
777
- .btn-sm,
778
- .btn-group-sm > .btn {
779
- padding: 5px 10px;
780
- font-size: 12px;
781
- line-height: 1.5;
782
- border-radius: 3px;
783
- text-decoration: none;
784
- }
785
- .btn-xs,
786
- .btn-group-xs > .btn {
787
- padding: 1px 5px;
788
- font-size: 12px;
789
- line-height: 1.5;
790
- border-radius: 3px;
791
- }
792
- .btn-block {
793
- display: block;
794
- width: 100%;
795
- padding-right: 0;
796
- padding-left: 0;
797
- }
798
- .btn-block + .btn-block {
799
- margin-top: 5px;
800
- }
801
- input[type="submit"].btn-block,
802
- input[type="reset"].btn-block,
803
- input[type="button"].btn-block {
804
- width: 100%;
805
- }
806
 
807
- .text-left {
808
- text-align: left;
809
  }
810
- .text-right {
811
- text-align: right;
812
  }
813
- .text-center {
814
- text-align: center;
815
  }
816
 
817
-
818
- .table {
819
- width: 100%;
820
- margin-bottom: 20px;
821
  }
822
- .table > thead > tr > th,
823
- .table > tbody > tr > th,
824
- .table > tfoot > tr > th,
825
- .table > thead > tr > td,
826
- .table > tbody > tr > td,
827
- .table > tfoot > tr > td {
828
- padding: 8px;
829
- line-height: 1.42857143;
830
- vertical-align: top;
831
- border-top: 1px solid #ddd;
832
- }
833
- .table > thead > tr > th {
834
- vertical-align: bottom;
835
- border-bottom: 0px solid #ddd;
836
- text-align: left;
837
- }
838
- .table > caption + thead > tr:first-child > th,
839
- .table > colgroup + thead > tr:first-child > th,
840
- .table > thead:first-child > tr:first-child > th,
841
- .table > caption + thead > tr:first-child > td,
842
- .table > colgroup + thead > tr:first-child > td,
843
- .table > thead:first-child > tr:first-child > td {
844
- border-top: 0;
845
- }
846
- .table > tbody + tbody {
847
- border-top: 2px solid #ddd;
848
- }
849
- .table .table {
850
- background-color: #fff;
851
  }
852
- .table-condensed > thead > tr > th,
853
- .table-condensed > tbody > tr > th,
854
- .table-condensed > tfoot > tr > th,
855
- .table-condensed > thead > tr > td,
856
- .table-condensed > tbody > tr > td,
857
- .table-condensed > tfoot > tr > td {
858
- padding: 5px;
 
 
859
  }
860
 
 
 
 
 
861
 
862
- .pull-right {
863
- float: right !important;
 
864
  }
865
- .pull-left {
866
- float: left !important;
 
867
  }
868
- .clearfix {
869
- clear: both;
 
 
870
  }
 
 
 
 
204
  .alert > p + p {
205
  margin-top: 5px;
206
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
207
  .alert-warning {
208
  color: #8a6d3b;
209
  background-color: #fcf8e3;
227
  color: #843534;
228
  }
229
 
230
+ label.mailmunch-form-label {
231
  display: inline-block;
232
  margin-bottom: 5px;
233
  font-weight: bold;
234
  }
235
+ .mailmunch-form-control {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
236
  display: block;
237
  width: 400px;
238
  height: 34px;
249
  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
250
  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
251
  }
252
+ .mailmunch-form-control:focus {
253
  border-color: #66afe9;
254
  outline: 0;
255
  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
256
  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
257
  }
258
+ .mailmunch-form-control::-moz-placeholder {
259
  color: #999;
260
  opacity: 1;
261
  }
262
+ .mailmunch-form-control:-ms-input-placeholder {
263
  color: #999;
264
  }
265
+ .mailmunch-form-control::-webkit-input-placeholder {
266
  color: #999;
267
  }
268
+
269
+ .mailmunch-form-group {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
270
  margin-bottom: 15px;
271
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
272
 
273
+ .mailmunch-btn {
 
274
  display: inline-block;
275
  padding: 6px 12px;
276
  margin-bottom: 0;
290
  border-radius: 4px;
291
  text-decoration: none;
292
  }
293
+ .mailmunch-btn:focus,
294
+ .mailmunch-btn:active:focus,
295
+ .mailmunch-btn.active:focus {
296
  outline: thin dotted;
297
  outline: 5px auto -webkit-focus-ring-color;
298
  outline-offset: -2px;
299
  }
300
+ .mailmunch-btn:hover,
301
+ .mailmunch-btn:focus {
302
  color: #333;
303
  text-decoration: none;
304
  }
305
+ .mailmunch-btn:active,
306
+ .mailmunch-btn.active {
307
  background-image: none;
308
  outline: 0;
309
  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
310
  box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
311
  }
312
+ .mailmunch-btn-success {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
313
  color: #fff;
314
  background-color: #5cb85c;
315
  border-color: #4cae4c;
316
  }
317
+ .mailmunch-btn-success:hover,
318
+ .mailmunch-btn-success:focus,
319
+ .mailmunch-btn-success:active,
320
+ .mailmunch-btn-success.active {
 
321
  color: #fff;
322
  background-color: #47a447;
323
  border-color: #398439;
324
  }
325
+ .mailmunch-btn-success:active,
326
+ .mailmunch-btn-success.active {
 
327
  background-image: none;
328
  }
329
+ .mailmunch-btn-success .badge {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
330
  color: #5cb85c;
331
  background-color: #fff;
332
  }
333
+ .mailmunch-btn-lg {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
334
  padding: 10px 16px;
335
  font-size: 18px;
336
  line-height: 1.33;
337
  border-radius: 6px;
338
  text-decoration: none;
339
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
340
 
341
+ .pull-right {
342
+ float: right !important;
343
  }
344
+ .pull-left {
345
+ float: left !important;
346
  }
347
+ .clearfix {
348
+ clear: both;
349
  }
350
 
351
+ .mailmunch-review-logo {
352
+ float: left;
353
+ margin-right: 15px;
 
354
  }
355
+
356
+ .mailmunch-review-logo img {
357
+ max-width: 80px;
358
+ max-height: 100%;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
359
  }
360
+
361
+ .mailmunch-review-notice {
362
+ border-left: 4px solid #11a1ec;
363
+ background: #fefefe;
364
+ padding: 10px 15px 1px;
365
+ box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
366
+ -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
367
+ margin: 15px 25px 20px 5px;
368
+ min-height: 100px;
369
  }
370
 
371
+ .mailmunch-review-notice .mailmunch-buttons {
372
+ margin-top: 15px;
373
+ margin-bottom: 10px;
374
+ }
375
 
376
+ .mailmunch-review-notice .mailmunch-buttons .dashicons {
377
+ font-size: 14px;
378
+ line-height: 1.9;
379
  }
380
+
381
+ .mailmunch-review-notice .mailmunch-buttons .dashicons-star-filled {
382
+ color: #e6bb00;
383
  }
384
+
385
+ .mailmunch-review-notice .mailmunch-buttons .dashicons-no-alt {
386
+ color: rgb(220, 58, 58);
387
+ line-height: 2;
388
  }
389
+
390
+ .mailmunch-review-notice .mailmunch-buttons a {
391
+ margin-right: 10px;
392
+ }
admin/img/logo.png ADDED
Binary file
admin/partials/mailmunch-modals.php CHANGED
@@ -21,28 +21,28 @@
21
  <div class="alert alert-danger signup-alert" role="alert">Account with this email already exists. Please sign in using your password.</div>
22
 
23
  <form action="" method="POST" id="signup_form">
24
- <div class="form-group">
25
- <label>Wordpress Name</label>
26
- <input type="text" placeholder="Site Name" name="site_name" value="<?php echo get_bloginfo(); ?>" class="form-control">
27
  </div>
28
 
29
- <div class="form-group">
30
- <label>Wordpress URL</label>
31
- <input type="text" placeholder="Site URL" name="site_url" value="<?php echo home_url() ?>" class="form-control">
32
  </div>
33
 
34
- <div class="form-group">
35
- <label>Email Address</label>
36
- <input type="email" placeholder="Email Address" name="email" value="<?php echo wp_get_current_user()->user_email; ?>" class="form-control">
37
  </div>
38
 
39
- <div class="form-group">
40
- <label>Password</label>
41
- <input type="password" placeholder="Password" name="password" class="form-control" />
42
  </div>
43
 
44
- <div class="form-group">
45
- <input type="submit" value="Sign Up &raquo;" class="btn btn-success btn-lg" />
46
  </div>
47
  </form>
48
  </div>
@@ -59,17 +59,17 @@
59
  <div class="form-container">
60
  <form action="" method="POST" id="signin_form">
61
 
62
- <div class="form-group">
63
  <label>Email Address</label>
64
- <input type="email" placeholder="Email Address" name="email" class="form-control" value="" />
65
  </div>
66
- <div class="form-group">
67
  <label>Password</label>
68
- <input type="password" placeholder="Password" name="password" class="form-control" />
69
  </div>
70
 
71
- <div class="form-group">
72
- <input type="submit" value="Sign In &raquo;" class="btn btn-success btn-lg" />
73
  </div>
74
  </form>
75
  </div>
21
  <div class="alert alert-danger signup-alert" role="alert">Account with this email already exists. Please sign in using your password.</div>
22
 
23
  <form action="" method="POST" id="signup_form">
24
+ <div class="mailmunch-form-group">
25
+ <label class="mailmunch-form-label">Wordpress Name</label>
26
+ <input type="text" placeholder="Site Name" name="site_name" value="<?php echo get_bloginfo(); ?>" class="mailmunch-form-control">
27
  </div>
28
 
29
+ <div class="mailmunch-form-group">
30
+ <label class="mailmunch-form-label">Wordpress URL</label>
31
+ <input type="text" placeholder="Site URL" name="site_url" value="<?php echo home_url() ?>" class="mailmunch-form-control">
32
  </div>
33
 
34
+ <div class="mailmunch-form-group">
35
+ <label class="mailmunch-form-label">Email Address</label>
36
+ <input type="email" placeholder="Email Address" name="email" value="<?php echo wp_get_current_user()->user_email; ?>" class="mailmunch-form-control">
37
  </div>
38
 
39
+ <div class="mailmunch-form-group">
40
+ <label class="mailmunch-form-label">Password</label>
41
+ <input type="password" placeholder="Password" name="password" class="mailmunch-form-control" />
42
  </div>
43
 
44
+ <div class="mailmunch-form-group">
45
+ <input type="submit" value="Sign Up &raquo;" class="mailmunch-btn mailmunch-btn-success mailmunch-btn-lg" />
46
  </div>
47
  </form>
48
  </div>
59
  <div class="form-container">
60
  <form action="" method="POST" id="signin_form">
61
 
62
+ <div class="mailmunch-form-group">
63
  <label>Email Address</label>
64
+ <input type="email" placeholder="Email Address" name="email" class="mailmunch-form-control" value="" />
65
  </div>
66
+ <div class="mailmunch-form-group">
67
  <label>Password</label>
68
+ <input type="password" placeholder="Password" name="password" class="mailmunch-form-control" />
69
  </div>
70
 
71
+ <div class="mailmunch-form-group">
72
+ <input type="submit" value="Sign In &raquo;" class="mailmunch-btn mailmunch-btn-success mailmunch-btn-lg" />
73
  </div>
74
  </form>
75
  </div>
includes/class-mailmunch-activator.php CHANGED
@@ -30,7 +30,7 @@ class Mailmunch_Activator {
30
  * @since 2.0.0
31
  */
32
  public static function activate() {
33
-
34
  }
35
 
36
  }
30
  * @since 2.0.0
31
  */
32
  public static function activate() {
33
+ update_option('mailmunch_activation_redirect', 'true');
34
  }
35
 
36
  }
includes/class-mailmunch-deactivator.php CHANGED
@@ -30,7 +30,7 @@ class Mailmunch_Deactivator {
30
  * @since 2.0.0
31
  */
32
  public static function deactivate() {
33
-
34
  }
35
 
36
  }
30
  * @since 2.0.0
31
  */
32
  public static function deactivate() {
33
+ update_option('mailmunch_activation_redirect', 'true');
34
  }
35
 
36
  }
includes/class-mailmunch.php CHANGED
@@ -18,7 +18,8 @@ define( 'MAILMUNCH_URL', "http://wordpress.mailmunch.co" );
18
  define( 'MAILMUNCH_HOME_URL', "http://app.mailmunch.co" );
19
  define( 'MAILMUNCH_SLUG', "mailmunch" );
20
  define( 'MAILMUNCH_PREFIX', 'mailmunch' );
21
- define( 'MAILMUNCH_VERSION', '2.0.1' );
 
22
 
23
  /**
24
  * The core plugin class.
@@ -189,13 +190,18 @@ class Mailmunch {
189
  */
190
  private function define_admin_hooks() {
191
 
192
- $plugin_admin = new Mailmunch_Admin( $this->get_plugin_name(), $this->get_intgration_name(), $this->get_version() );
193
 
194
  $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
195
  $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
196
  $this->loader->add_action( 'admin_menu', $plugin_admin, 'menu' );
197
  $this->loader->add_action( 'init', $plugin_admin, 'init' );
198
- $this->loader->add_action( 'admin_notices', $plugin_admin, 'activation_notice' );
 
 
 
 
 
199
 
200
  // Ajax calls
201
  $this->loader->add_action( 'wp_ajax_sign_up', $plugin_admin, 'sign_up' );
@@ -262,7 +268,7 @@ class Mailmunch {
262
  * @since 2.0.0
263
  * @return string The name of the plugin.
264
  */
265
- public function get_intgration_name() {
266
  return $this->integration_name;
267
  }
268
 
18
  define( 'MAILMUNCH_HOME_URL', "http://app.mailmunch.co" );
19
  define( 'MAILMUNCH_SLUG', "mailmunch" );
20
  define( 'MAILMUNCH_PREFIX', 'mailmunch' );
21
+ define( 'MAILMUNCH_PLUGIN_DIRECTORY', 'mailmunch' );
22
+ define( 'MAILMUNCH_VERSION', '2.0.2' );
23
 
24
  /**
25
  * The core plugin class.
190
  */
191
  private function define_admin_hooks() {
192
 
193
+ $plugin_admin = new Mailmunch_Admin( $this->get_plugin_name(), $this->get_integration_name(), $this->get_version() );
194
 
195
  $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
196
  $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
197
  $this->loader->add_action( 'admin_menu', $plugin_admin, 'menu' );
198
  $this->loader->add_action( 'init', $plugin_admin, 'init' );
199
+ $this->loader->add_action( 'admin_init', $plugin_admin, 'activation_redirect' );
200
+ $this->loader->add_action( 'admin_init', $plugin_admin, 'check_installation_date' );
201
+
202
+ // Review Notice
203
+ $this->loader->add_action( 'admin_init', $plugin_admin, 'dismiss_review_notice' );
204
+ $this->loader->add_action( 'admin_notices', $plugin_admin, 'review_us_notice' );
205
 
206
  // Ajax calls
207
  $this->loader->add_action( 'wp_ajax_sign_up', $plugin_admin, 'sign_up' );
268
  * @since 2.0.0
269
  * @return string The name of the plugin.
270
  */
271
+ public function get_integration_name() {
272
  return $this->integration_name;
273
  }
274
 
mailmunch.php CHANGED
@@ -16,7 +16,7 @@
16
  * Plugin Name: MailMunch - Increase your Email Subscribers by over 500%
17
  * Plugin URI: http://www.mailmunch.co
18
  * Description: Collect email addresses from website visitors and grow your subscribers with our attention grabbing optin-forms, entry/exit intent technology, and other effective lead-generation forms.
19
- * Version: 2.0.1
20
  * Author: MailMunch
21
  * Author URI: http://www.mailmunch.co
22
  * License: GPL-2.0+
16
  * Plugin Name: MailMunch - Increase your Email Subscribers by over 500%
17
  * Plugin URI: http://www.mailmunch.co
18
  * Description: Collect email addresses from website visitors and grow your subscribers with our attention grabbing optin-forms, entry/exit intent technology, and other effective lead-generation forms.
19
+ * Version: 2.0.2
20
  * Author: MailMunch
21
  * Author URI: http://www.mailmunch.co
22
  * License: GPL-2.0+
readme.txt CHANGED
@@ -1,9 +1,9 @@
1
  === MailMunch - Grow your Email Subscribers ===
2
- Contributors: mailmunch
3
  Tags: signup form, newsletter, newsletters, subscribe, popup, exit popup, exit intent, subscribers, subscription, popover, lightbox, analytics, collect email, optin, optin form, optin forms, double optin, list builder, email form, lead, leads, mailchimp, mailchimp form, mailchimp newsletter, mailchimp plugin, mailchimp signup, mailchimp signup forms, mailchimp signup form, mailchimp widget, mailchimp subscribe, constant contact, contact contact form, constant contact newsletter, constant contact plugin, constant contact signup, constant contact signup forms, constant contact signup form, constant contact widget, constant contact subscribe, aweber, aweber form, aweber forms, aweber signup form, aweber plugin
4
  Requires at least: 3.0.1
5
- Tested up to: 4.3
6
- Stable tag: 2.0.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
1
  === MailMunch - Grow your Email Subscribers ===
2
+ Contributors: mailmunch, lizgannes
3
  Tags: signup form, newsletter, newsletters, subscribe, popup, exit popup, exit intent, subscribers, subscription, popover, lightbox, analytics, collect email, optin, optin form, optin forms, double optin, list builder, email form, lead, leads, mailchimp, mailchimp form, mailchimp newsletter, mailchimp plugin, mailchimp signup, mailchimp signup forms, mailchimp signup form, mailchimp widget, mailchimp subscribe, constant contact, contact contact form, constant contact newsletter, constant contact plugin, constant contact signup, constant contact signup forms, constant contact signup form, constant contact widget, constant contact subscribe, aweber, aweber form, aweber forms, aweber signup form, aweber plugin
4
  Requires at least: 3.0.1
5
+ Tested up to: 4.5
6
+ Stable tag: 2.0.2
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
uninstall.php CHANGED
@@ -31,4 +31,7 @@ if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
31
  }
32
 
33
  delete_option('mailmunch_user_token');
34
- delete_option('mailmunch_site_id');
 
 
 
31
  }
32
 
33
  delete_option('mailmunch_user_token');
34
+ delete_option('mailmunch_site_id');
35
+ delete_option('mailmunch_activation_redirect');
36
+ delete_option('mailmunch_activation_date');
37
+ delete_option('mailmunch_dismiss_review_notice');