Merge pull request #1 from webgrafia/master

Update fork
webgrafia · Aug 10, 2017 · 41fdf5a · 41fdf5a
2 parents 3b03b59 + 63d8f81
commit 41fdf5a
Show file tree

Hide file tree

Showing 9 changed files with 221 additions and 306 deletions.
diff --git a/admin/ginger.about.php b/admin/ginger.about.php
@@ -0,0 +1,21 @@
+
+<div class="wrap">
+ <div style="background-color: #F99A30; padding:10px;">
+
+     <a href="http://www.ginger-cookielaw.com/download/" target="_blank" ><img src="<?php echo plugins_url('../admin/img/logo-head.png', __FILE__)?>" style="float: left;"></a>
+     <p style="color: #FFFFFF; font-size: 30px; ">Need more?<br> Import-Export tools, Dinamic Google Analytics, Custom JS configurator, Logger, Multilanguage Tools, and more </p>
+
+ </div>
+
+
+    <div style="text-align: center; margin:60px 0px;"><h1 style="font-size: 40px; "><a href="http://www.ginger-cookielaw.com/download/" target="_blank" style="border-bottom: solid 6px #F99A30; color:#F99A30;text-decoration: none;">GET GINGER PLUS!</a></h1></div>
+
+
+    <br style="clear:both;">
+
+    <br style="clear:both;">
+
+
+
+
+</div>
diff --git a/admin/ginger.admin.php b/admin/ginger.admin.php
@@ -90,6 +90,8 @@
    <a href="admin.php?page=ginger-setup&tab=banner" class="nav-tab <?php echo (($_GET["page"] == 'ginger-setup') && (isset($_GET["tab"]) && $_GET["tab"] == "banner" )) ? 'nav-tab-active' : ''; ?>"><?php _e("Banner Setup", "ginger"); ?></a>
    <a href="admin.php?page=ginger-setup&tab=policy" class="nav-tab <?php echo (($_GET["page"] == 'ginger-setup') && (isset($_GET["tab"]) && $_GET["tab"] == "policy" )) ? 'nav-tab-active' : ''; ?>"><?php _e("Privacy Policy", "ginger"); ?></a>
        <?php  do_action("ginger_add_tab_menu"); ?>
+  <a href="admin.php?page=ginger-setup&tab=more" class="nav-tab <?php echo (($_GET["page"] == 'ginger-setup') && (isset($_GET["tab"]) && $_GET["tab"] == "more" )) ? 'nav-tab-active' : ''; ?>"><?php _e("More", "ginger"); ?></a>
+
    </h2>
     <form method="post" action="admin.php?page=<?php echo $_GET["page"]; ?><?php if(isset($tab)) echo '&tab=' . $tab; ?>" <?php echo 'class="repeater"';?>>
         <?php wp_nonce_field('save_ginger_options', 'ginger_options'); ?>
@@ -104,8 +106,16 @@
                 case "policy":
                 include('partial/policy.php');
                 break;
-            }?>
+            case "more":
+                include('partial/more.php');
+                break;
+            }
+if($tab != "more"){
+?>
         <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e("Save Changes", "ginger"); ?>"></p>
+    <?php
+}
+?>
     </form>
 </div>
 

diff --git a/admin/ginger.pointer.php b/admin/ginger.pointer.php
diff --git a/admin/ginger.utils.php b/admin/ginger.utils.php
@@ -11,7 +11,10 @@
 add_action( 'admin_menu', 'register_ginger_menu_page' );
 function register_ginger_menu_page(){
     global $ginger_menu_hook;
-    $ginger_menu_hook = add_menu_page( 'ginger', 'Ginger Cookie', 'manage_options', 'ginger-setup', 'ginger_menu_page', plugins_url( 'ginger/img/ginger-color.png' ));
+
+	$capability = apply_filters('ginger_admin_menu_capability', 'manage_options');
+
+	$ginger_menu_hook = add_menu_page( 'ginger', 'Ginger Cookie', $capability, 'ginger-setup', 'ginger_menu_page', plugins_url( 'ginger/img/ginger-color.png' ));
     do_action("ginger_add_menu");
 
 

diff --git a/admin/partial/general.php b/admin/partial/general.php
@@ -237,7 +237,7 @@
                             ?>
                             <div data-repeater-item>
                                 <select name="select-input" style="min-width:30%">
-                                    <option value="">Seleziona</option>
+                                    <option value=""><?php _e( 'Select', 'ginger'); ?></option>
 
                             <?php
                                 foreach ($pages as $page):
@@ -276,7 +276,7 @@
                             ?>
                             <div data-repeater-item>
                                 <select name="select-input" style="min-width:30%">
-                                    <option value="">Seleziona</option>
+                                    <option value=""><?php _e( 'Select', 'ginger'); ?></option>
 
                             <?php
                                 foreach ($pages as $page):

diff --git a/admin/partial/more.php b/admin/partial/more.php
@@ -0,0 +1,6 @@
+<h3><?php _e("Need More?", "ginger"); ?></h3>
+
+<p><?php _e("If you need help on privacy policy, or other stuff not covered by Ginger, try Iubenda from this link:", "ginger"); ?></p>
+<p><h3><a href="http://iubenda.refr.cc/VGW2J8C">http://iubenda.refr.cc/VGW2J8C</a></h3></p>
+
+<p><?php _e("You will get a special discount as Ginger user!", "ginger"); ?></p>
diff --git a/ginger-eu-cookie-law.php b/ginger-eu-cookie-law.php
@@ -3,7 +3,7 @@
 Plugin Name: Ginger - EU Cookie Law
 Plugin URI: http://www.ginger-cookielaw.com/
 Description: Make your website compliant with EU Cookie Policy! Now totally free and unlocked
-Version: 4.0
+Version: 4.1.2
 Author: Manafactory
 Author URI: http://manafactory.it/
 License: GPLv2 or later