Merge pull request #16 from grueneschweiz/dev

1.7.1

.docker/wordpress.Dockerfile

@@ -0,0 +1,5 @@
+FROM wordpress
+
+# Add xdebug
+RUN pecl install xdebug
+RUN docker-php-ext-enable xdebug

.gitignore

@@ -1,2 +1,3 @@
 .idea
-node_modules
+node_modules
+/wordpress

README.md

@@ -3,7 +3,7 @@
 **Tags:** donations, raisenow, fundraising  
 **Requires at least:** 4.9  
 **Tested up to:** 5.6.0  
-**Stable tag:** 1.7.0
+**Stable tag:** 1.7.1
 **License:** GPLv2 or later    
 **License URI:** https://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -37,6 +37,10 @@ Same as any other standard WordPress plugin.
 
 ## Changelog ##
 
+### 1.7.1 ###
+* Fix PHP notice if shortcode misses amounts.
+* Shortcode generator not fully visible on small screens.
+
 ### 1.7.0 ###
 * Support for italian donation forms.
 

css/raisenow-community-admin.css

@@ -1,3 +1,10 @@
+.raisenow-community-wrapper {
+    overflow-y: scroll;
+    overflow-x: hidden;
+    width: min(100%, calc(100vw - 65px));
+    height: min(100%, calc(100vh - 123px));
+}
+
 #raisenow-community-short-code-message {
     display: none;
 }

docker-compose.yml

@@ -1,26 +1,36 @@
-# https://github.com/chriszarate/docker-compose-wordpress
-
-version: "2"
+version: "3.8"
 
 services:
   wordpress:
-    image: "chriszarate/wordpress"
+    image: grueneschweiz/raisenow-community:latest
+    build:
+      context: .
+      dockerfile: "./.docker/wordpress.Dockerfile"
     environment:
-      VIRTUAL_HOST: "${DOCKER_DEV_DOMAIN}"
-      WORDPRESS_ACTIVATE_PLUGINS: "raisenow-community" # plugin folder relative to /wp-content/plugins/
-      WORDPRESS_ACTIVATE_THEME: ""   # theme folder relative to /wp-content/themes/
-      WORDPRESS_SITE_TITLE: "RaiseNow Community Plugin"
-      WORDPRESS_SITE_URL: "http://${DOCKER_DEV_DOMAIN}"
-      XDEBUG_CONFIG: "remote_host=${DOCKER_LOCAL_IP} idekey=xdebug"
+      WORDPRESS_DB_HOST: "mysql"
+      WORDPRESS_DB_NAME: "wordpress"
+      WORDPRESS_DB_PASSWORD: ""
+      WORDPRESS_DB_USER: "root"
+      WORDPRESS_DEBUG: 1
+      PHP_IDE_CONFIG: serverName=Docker
     depends_on:
       - "mysql"
     volumes:
       - ".:/var/www/html/wp-content/plugins/raisenow-community"
+      - "./.docker/addon-php.ini:/usr/local/etc/php/conf.d/addon-php.ini:ro"
     ports:
       - "8080:80"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
   mysql:
     image: "mariadb:10.2"
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
       MYSQL_DATABASE: "wordpress"
-      MYSQL_ROOT_PASSWORD: ""
+      MYSQL_ROOT_PASSWORD: ""
+    volumes:
+      - "db:/var/lib/mysql"
+
+volumes:
+  db:

includes/class-raisenow-community-admin.php

@@ -20,7 +20,7 @@ public function add_media_button() {
 		add_thickbox();
 
 		// add media button
-		echo '<a href="#TB_inline?&inlineId=' . RAISENOW_COMMUNITY_PREFIX . '-short-code-generator&height=700" class="thickbox button" ' .
+		echo '<a href="#TB_inline?&inlineId=' . RAISENOW_COMMUNITY_PREFIX . '-short-code-generator&height=550&width=600" class="thickbox button" ' .
 		     'title="' . esc_attr__( 'Insert Donation Form', RAISENOW_COMMUNITY_PREFIX ) . '">' .
 		     '<span class="wp-media-buttons-icon dashicons dashicons-plus"></span> ' .
 		     __( 'Insert Donation Form', RAISENOW_COMMUNITY_PREFIX ) . '</a>';

includes/class-raisenow-community-frontend.php

@@ -75,8 +75,8 @@ public function donation_form( $atts ) {
 			}
 		}
 
-		$one_time_amounts  = $this->get_amounts( 'one_time', $atts );
-		$recurring_amounts = $this->get_amounts( 'recurring', $atts );
+		$one_time_amounts  = $this->get_amounts( 'one_time', $options );
+		$recurring_amounts = $this->get_amounts( 'recurring', $options );
 
 		$custom_css    = $options['css'];
 		$custom_script = $options['javascript'];

raisenow-community.php

@@ -7,7 +7,7 @@
  * Author URI:      https://github.com/cyrillbolliger
  * Text Domain:     raisenow-community
  * Domain Path:     /languages
- * Version:         1.7.0
+ * Version:         1.7.1
  *
  * @package         Raisenow_Community
  */
@@ -25,7 +25,7 @@
 /**
  * version number (don't forget to change it also in the header)
  */
-define( 'RAISENOW_COMMUNITY_VERSION', '1.7.0' );
+define( 'RAISENOW_COMMUNITY_VERSION', '1.7.1' );
 
 /**
  * plugin prefix

readme.txt

@@ -3,7 +3,7 @@ Contributors: cyrillbolliger, phil8900, vdrouotmecom
 Tags: donations, raisenow, fundraising
 Requires at least: 4.9
 Tested up to: 5.6.0
-Stable tag: 1.7.0
+Stable tag: 1.7.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -37,6 +37,10 @@ Same as any other standard WordPress plugin.
 
 == Changelog ==
 
+= 1.7.1 =
+* Fix PHP notice if shortcode misses amounts.
+* Shortcode generator not fully visible on small screens.
+
 = 1.7.0 =
 * Support for italian donation forms.