b001

simpliko · May 6, 2022 · 80fce62 · 80fce62
1 parent b28006e
commit 80fce62
Show file tree

Hide file tree

Showing 12 changed files with 886 additions and 17 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -22,7 +22,26 @@ module.exports = function(grunt) {
                     updateTimestamp: true,            // Whether the POT-Creation-Date should be updated without other changes.
                     updatePoFiles: false              // Whether to update PO files in the same directory as the POT file.
                 }
-            }
+            },
+            build: {
+                options: {
+                    cwd: '<%= pkg.release_path %>',                          // Directory of files to internationalize.
+                    domainPath: '/languages/',                   // Where to save the POT file.
+                    exclude: [],                      // List of files or directories to ignore.
+                    include: [],                      // List of files or directories to include.
+                    mainFile: 'wpadverts.php',                     // Main project file.
+                    potComments: '',                  // The copyright at the beginning of the POT file.
+                    potFilename: 'wpadverts.pot',                  // Name of the POT file.
+                    potHeaders: {
+                        poedit: true,                 // Includes common Poedit headers.
+                        'x-poedit-keywordslist': true // Include a list of all possible gettext functions.
+                    },                                // Headers to add to the generated POT file.
+                    processPot: null,                 // A callback function for manipulating the POT file.
+                    type: 'wp-plugin',                // Type of project (wp-plugin or wp-theme).
+                    updateTimestamp: true,            // Whether the POT-Creation-Date should be updated without other changes.
+                    updatePoFiles: false              // Whether to update PO files in the same directory as the POT file.
+                }
+            },
         },
         copy: {
             deploy: {
@@ -34,6 +53,21 @@ module.exports = function(grunt) {
                         dest:   "<%= pkg.svn %>/trunk/"
                     }
                ] 
+            },
+            build: {
+                files: [
+                    {
+                        expand: true,
+                        cwd:    './',
+                        src:    [ 
+                            '**', '!node_modules/**', '!Gruntfile.js', '!package.json', '!.gitignore', '!nbproject/**', 
+                            '!tests/**', '!bin/**', '!.phpcs.xml.dist', '!.travis.yml', '!phpunit.xml.dist',
+                            '!blocks.webpack.js', '!package-lock.json', '!postcss.config.js', '!tailwind.config.js',
+                            '!blocks/*/src/*.js'
+                        ],
+                        dest:   "<%= pkg.release_path %>"
+                    }
+               ]  
             }
         },
         checktextdomain: {
@@ -63,14 +97,37 @@ module.exports = function(grunt) {
                    expand: true
                }]
             }
+        },
+        compress: {
+            build: {
+                options: {
+                    archive: '<%= pkg.release_path %>/../wpadverts.zip',
+                    mode: 'zip'
+                },
+                files: [
+                    { 
+                        src: './wpadverts/**',
+                        cwd: '<%= pkg.release_path %>/../',
+                        expand: true
+                    }
+                ]
+            }
+        },
+        clean: {
+            options: {
+                force: true
+            },
+            build: [ '<%= pkg.release_path %>' ]
         }
     });
 
     grunt.loadNpmTasks('grunt-wp-i18n');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-checktextdomain');
+    grunt.loadNpmTasks('grunt-contrib-compress');
+    grunt.loadNpmTasks('grunt-contrib-clean');
 
     grunt.registerTask('test', ['checktextdomain']);
     grunt.registerTask('deploy', ['checktextdomain', 'copy', 'makepot']);
-
+    grunt.registerTask('build', ['checktextdomain', 'clean:build', 'copy:build', 'makepot:build', 'compress:build']);
 };
diff --git a/addons/payments/payments.php b/addons/payments/payments.php
@@ -598,7 +598,7 @@ function adext_payments_get_template( $file, $is_block ) {
  * @return      null
  */
 function adext_payments_action_payment_block( $content, Adverts_Form $form ) {
-    adext_payments_action_payment( $content, $form, true );
+    return adext_payments_action_payment( $content, $form, true );
 }
 
 /**
@@ -681,14 +681,10 @@ function adext_payments_action_payment($content, Adverts_Form $form, $is_block =
     $price = get_post_meta($payment_id, '_adverts_payment_total', true);
 
     $tpl = adext_payments_get_template( "add-payment", $is_block );
-    if( $is_block ) {
-        include $tpl;
-    } else {
-        ob_start();
-        include $tpl;
-        return ob_get_clean();
-    }
 
+    ob_start();
+    include $tpl;
+    return ob_get_clean();
 }
 
 /**

diff --git a/assets/js/block-manage.js b/assets/js/block-manage.js
@@ -164,4 +164,10 @@ jQuery(function($) {
 
         return false;
     });
+
+    $(".wpadverts-block-manage .wpa-block-list-results > .wpa-result-item").on("click", function(e) {
+        window.location = $(this).find(".wpa-result-link").attr("href");
+    });
+    $(".wpadverts-block-manage .wpa-block-list-results > .wpa-result-item").addClass("atw-cursor-pointer");
+
 });
diff --git a/assets/js/wpadverts-multiselect.js b/assets/js/wpadverts-multiselect.js
@@ -83,7 +83,7 @@ jQuery(function($) {
           }
 
           label.append(checkbox).append(" ").append(jQuery("<span></span>").text(o.text()));
-          options.append(label);
+          options.hide().append(label);
       });
 
       holder.append(input).append(options);

diff --git a/blocks/categories/index.php b/blocks/categories/index.php
@@ -55,7 +55,7 @@ public function init() {
                 'editor_style' => 'wpadverts-blocks-categories',
                 'editor_script' => $js_handler,
                 'render_callback' => array( $this, "render" ),
-                'style' => 'wpadverts-blocks-common',
+                'style' => 'wpadverts-blocks',
                 'script' => 'wpadverts-block-categories'
             )
         );

diff --git a/blocks/manage/class-manage-engine.php b/blocks/manage/class-manage-engine.php
@@ -164,6 +164,14 @@ public function action_list( $atts ) {
     }
 
     public function action_edit( $atts ) {
+
+        wp_enqueue_style( 'adverts-frontend' );
+        wp_enqueue_style( 'adverts-icons' );
+        wp_enqueue_style( 'adverts-icons-animate' );
+
+        wp_enqueue_script( 'adverts-frontend' );
+        wp_enqueue_script( 'adverts-auto-numeric' );
+
         $params = shortcode_atts(array(
             'name' => 'default',
             'moderate' => false
@@ -335,10 +343,20 @@ public function action_edit( $atts ) {
         $buttons_manage = apply_filters( "wpadverts/block/manage/buttons-manage", $buttons_manage, $post_id );
         uasort( $buttons_manage, array( $this, "sort_buttons" ) );
 
+        $_layouts = array(
+            "adverts-form-stacked" => "wpa-layout-stacked",
+            "adverts-form-aligned" => "wpa-layout-aligned"
+        );
+        $form_layout = $_layouts[$form->get_layout()];
+
         // adverts/templates/manage-edit.php
+        ob_start();
         include dirname( __FILE__ ) . '/templates/manage-edit.php';
+        $result = ob_get_clean();
 
         remove_action( "wpadverts/tpl/partial/form/before-buttons", array( $this, "moderation_notice" ) );
+
+        return $result;
     }
 
     public function moderation_notice() {

diff --git a/blocks/manage/index.php b/blocks/manage/index.php
@@ -63,7 +63,7 @@ public function init() {
                 'editor_style' => 'wpadverts-blocks-manage',
                 'editor_script' => $js_handler,
                 'render_callback' => array( $this, "render" ),
-                'style' => 'wpadverts-blocks-common',
+                'style' => 'wpadverts-blocks',
                 'script' => 'wpadverts-block-manage'
             )
         );

diff --git a/blocks/publish/index.php b/blocks/publish/index.php
@@ -47,7 +47,7 @@ public function init() {
                 'editor_style' => 'wpadverts-blocks-editor-publish',
                 'editor_script' => $js_handler,
                 'render_callback' => array( $this, "render" ),
-                'style' => 'wpadverts-blocks-common',
+                'style' => 'wpadverts-blocks',
                 'script' => 'wpadverts-block-publish'
             )
         );

diff --git a/languages/wpadverts-nl_NL.mo b/languages/wpadverts-nl_NL.mo