Skip to content

Commit

Permalink
Merge pull request #9 from michelegiorgi/development
Browse files Browse the repository at this point in the history
Release v1.2.3
  • Loading branch information
michelegiorgi authored Feb 21, 2021
2 parents 6c8b320 + 160f283 commit 8087302
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 28 deletions.
26 changes: 13 additions & 13 deletions assets/scripts/editor/main/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const {

const { registerPlugin } = wp.plugins;

const {
const {
ColorPicker,
Panel,
PanelBody,
Expand All @@ -31,7 +31,7 @@ const {
TabPanel,
} = wp.components;

const {
const {
MediaUpload,
} = wp.blockEditor;

Expand All @@ -51,14 +51,14 @@ import {
//const { compose } = wp.compose;

class Formality_Sidebar extends Component {

constructor() {
super( ...arguments );

//get post metas
let formality_keys = wp.data.select('core/editor').getEditedPostAttribute('meta')

//define default values
//define default values
let default_keys = {
'_formality_type': 'standard',
'_formality_style': 'box',
Expand Down Expand Up @@ -86,7 +86,7 @@ class Formality_Sidebar extends Component {
'_formality_email': '',
'_formality_send_text' : '',
}

//check if formality keys are already defined
if(!formality_keys) {
formality_keys = default_keys
Expand All @@ -97,13 +97,13 @@ class Formality_Sidebar extends Component {
wp.data.dispatch('core/editor').editPost({meta: formality_keys})
}
}

//set templates variables
formality_keys['_formality_templates_count'] = parseInt(formality.templates_count)
formality_keys['_formality_templates_progress'] = false
formality_keys['_formality_templates_error'] = ''
formality_keys['_formality_ssl_status'] = 0

//set state and remove loading layer
this.state = formality_keys
applyFormalityStyles(this.state)
Expand All @@ -114,7 +114,7 @@ class Formality_Sidebar extends Component {

const postId = wp.data.select("core/editor").getCurrentPostId();
const postPermalink = wp.data.select('core/editor').getPermalink();

let tabAppearance = (
<Fragment>
<div
Expand Down Expand Up @@ -235,7 +235,7 @@ class Formality_Sidebar extends Component {
)}
/>
</BaseControl>
{ this.state['_formality_logo'] ?
{ this.state['_formality_logo'] ?
<BaseControl
label={ __( 'Logo height multiplier', 'formality' ) }
help={ __( "Based on font-size setting:", 'formality' ) + " " + ((this.state['_formality_logo_height'] ? this.state['_formality_logo_height'] : 3) * this.state['_formality_fontsize']) + "px" }
Expand Down Expand Up @@ -353,7 +353,7 @@ class Formality_Sidebar extends Component {
{ buildFormalityTemplates(this) }
</Fragment>
)

let tabSettings = (
<Fragment>
<Panel>
Expand Down Expand Up @@ -427,7 +427,7 @@ class Formality_Sidebar extends Component {
title={__('Notifications', 'formality')}
initialOpen={ false }
>
<p>{ __('Formality automatically saves all the results in the Wordpress database, but if you want you can also activate e-mail notifications, by entering your address.', 'formality') }</p>
<p>{ __('Formality automatically saves all the results in the WordPress database, but if you want you can also activate e-mail notifications, by entering your address.', 'formality') }</p>
<TextControl
//label={__('Error message', 'formality')}
placeholder={__('E-mail address', 'formality')}
Expand Down Expand Up @@ -467,7 +467,7 @@ class Formality_Sidebar extends Component {
</Panel>
</Fragment>
)

return (
<Fragment>
<TabPanel
Expand Down
4 changes: 2 additions & 2 deletions assets/styles/admin/editor_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
left: 0;
border-color: var(--formality_col1);
border: none;
box-shadow: -3px 0 0 0 var(--formality_col1);
box-shadow: -3px 0 0 0 var(--formality_col1) !important;
opacity: 0;
border-radius: 0;
}
Expand Down Expand Up @@ -388,7 +388,7 @@
border-top-color: var(--formality_col1_alpha);
border-top-style: solid;
border-top-width: 1px;
box-shadow: none;
box-shadow: none !important;
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions assets/styles/admin/sidebar_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,13 @@
}
}
}
::-webkit-input-placeholder {
color: #757575 !important;
}
:-ms-input-placeholder {
color: #757575 !important;
}
::placeholder {
color: #757575 !important;
}
}
4 changes: 2 additions & 2 deletions formality.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Plugin Name: Formality
* Plugin URI: https://formality.dev
* Description: Forms made simple (and cute). Designless, multistep, conversational, secure, all-in-one WordPress forms plugin.
* Version: 1.2.2
* Version: 1.2.3
* Author: Michele Giorgi
* Author URI: https://giorgi.io
* License: GPLv3
Expand Down Expand Up @@ -51,7 +51,7 @@
/**
* Currently plugin version.
*/
define( 'FORMALITY_VERSION', '1.2.2' );
define( 'FORMALITY_VERSION', '1.2.3' );

/**
* The code that runs during plugin activation.
Expand Down
8 changes: 4 additions & 4 deletions includes/class-formality.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct() {
if ( defined( 'FORMALITY_VERSION' ) ) {
$this->version = FORMALITY_VERSION;
} else {
$this->version = '1.0.1';
$this->version = '1.2.3';
}
$this->formality = 'formality';

Expand Down Expand Up @@ -195,12 +195,12 @@ private function define_public_hooks() {
* @access private
*/
private function setup() {

$plugin_setup = new Formality_Setup( $this->get_formality(), $this->get_version() );
$this->loader->add_action( 'init', $plugin_setup, 'post_types' );

}

/**
* Run the loader to execute all of the hooks with WordPress.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"Form type": [
"Tipo form"
],
"Formality automatically saves all the results in the Wordpress database, but if you want you can also activate e-mail notifications, by entering your address.": [
"Formality automatically saves all the results in the WordPress database, but if you want you can also activate e-mail notifications, by entering your address.": [
"Formality salva automaticamente tutti i risultati sul database di WordPress, ma se vuoi puoi attivare anche le notifiche, inserendo il tuo indirizzo email."
],
"Formality form": [
Expand Down Expand Up @@ -534,4 +534,4 @@
]
}
}
}
}
Binary file modified languages/formality-it_IT.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion languages/formality-it_IT.po
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ msgstr "Formality"

#: dist/scripts/formality-editor.js:2970
msgid ""
"Formality automatically saves all the results in the Wordpress database, but "
"Formality automatically saves all the results in the WordPress database, but "
"if you want you can also activate e-mail notifications, by entering your "
"address."
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion languages/formality.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ msgid "Notifications"
msgstr ""

#: dist/scripts/formality-editor.js:2970
msgid "Formality automatically saves all the results in the Wordpress database, but if you want you can also activate e-mail notifications, by entering your address."
msgid "Formality automatically saves all the results in the WordPress database, but if you want you can also activate e-mail notifications, by entering your address."
msgstr ""

#: dist/scripts/formality-editor.js:2972
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Formality",
"version": "1.2.2",
"version": "1.2.3",
"author": "Michele Giorgi <[email protected]>",
"homepage": "https://giorgi.io",
"private": true,
Expand Down
10 changes: 8 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Contributors: michelegiorgi
Donate link: https://www.paypal.me/michelegiorgi/
Tags: form, conversational, multistep, design form, gutenberg, block editor
Requires at least: 5.5
Tested up to: 5.6
Stable tag: 1.2.2
Tested up to: 5.7
Stable tag: 1.2.3
Requires PHP: 7.0
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.txt
Expand Down Expand Up @@ -61,6 +61,12 @@ You will find **Formality** menu in your WordPress admin screen.

== Changelog ==

= 1.2.3 =
Release Date: February 21th, 2021

* Gutenberg 10+ compatibility
* Fix typo

= 1.2.2 =
Release Date: January 23th, 2021

Expand Down

0 comments on commit 8087302

Please sign in to comment.