Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Contact Form update to 5.1.6 #26

Merged
merged 1 commit into from
Mar 2, 2020
Merged

Contact Form update to 5.1.6 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
422 changes: 200 additions & 222 deletions wp-content/plugins/contact-form-7/admin/admin.php
View file
Open in desktop

Large diffs are not rendered by default.

72 changes: 72 additions & 0 deletions wp-content/plugins/contact-form-7/admin/css/styles-dark-mode.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#wpcf7-contact-form-list-table span.shortcode input,
#wpcf7-contact-form-editor span.shortcode input {
color: #fff;
}

div.config-error, span.config-error, ul.config-error {
color: #bbc8d4;
}

.keyboard-interaction {
color: #bbc8d4;
}

#contact-form-editor .contact-form-editor-panel {
background-color: #32373c;
}

#contact-form-editor-tabs {
border-bottom: 1px solid #aaa;
}

#contact-form-editor-tabs li {
border: 1px solid #ccc;
border-bottom: 1px solid #aaa;
background-color: #37444c;
}

#contact-form-editor-tabs li:hover {
background-color: #000;
}

#contact-form-editor-tabs li.ui-tabs-active,
#contact-form-editor-tabs li.ui-tabs-active:hover {
border-top: 1px solid #aaa;
border-right: 1px solid #aaa;
border-left: 1px solid #aaa;
border-bottom: 1px solid #32373c;
background-color: #32373c;
}

#contact-form-editor-tabs li a {
color: #bbc8d4;
}

#contact-form-editor-tabs li.ui-tabs-active a {
color: #fff;
}

#contact-form-editor-tabs li a:hover {
color: #fff;
}

.contact-form-editor-box-mail span.mailtag {
color: #ddd;
}

.contact-form-editor-box-mail span.mailtag.used {
color: #999;
}

#mail-panel .contact-form-editor-box-mail table.form-table tr th,
#mail-panel .contact-form-editor-box-mail table.form-table tr td {
background-color: #32373c;
}

div.wrap#wpcf7-integration .card.active {
border-color: #00a0d2;
}

div.wrap#wpcf7-integration .card .infobox {
color: #aaa;
}
4 changes: 0 additions & 4 deletions wp-content/plugins/contact-form-7/admin/css/styles-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
padding: 9px 10px 0 15px;
}

#contact-form-editor-tabs li a span.dashicons {
padding: 6px 4px 4px 0;
}

/*
* Form Tab
*/
Expand Down
63 changes: 39 additions & 24 deletions wp-content/plugins/contact-form-7/admin/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,27 @@ span.shortcode.old {
color: #fff;
}

span.shortcode > input {
background: inherit;
color: inherit;
span.shortcode input {
font-size: 12px;
border: none;
box-shadow: none;
padding: 4px 8px;
margin: 0;
}

#wpcf7-contact-form-list-table span.shortcode input,
#wpcf7-contact-form-editor span.shortcode input {
background: transparent;
}

#wpcf7-contact-form-list-table span.shortcode input {
color: #444;
}

#wpcf7-contact-form-editor span.shortcode input {
color: #fff;
}

#submitpost input.copy {
margin-bottom: 10px;
}
Expand Down Expand Up @@ -72,15 +83,30 @@ ul.config-error li {
margin: 0;
}

div.config-error span.dashicons,
ul.config-error li span.dashicons {
color: #82878c;
}

[data-config-field][aria-invalid="true"] {
border-color: #d00;
}

#contact-form-editor-tabs li a .icon-in-circle,
#contact-form-editor .config-error .icon-in-circle,
.wp-list-table .config-error .icon-in-circle,
.icon-in-circle {
display: inline-block;
vertical-align: text-top;
margin: 1px 6px 0;
padding: 0 5px;
min-width: 7px;
height: 17px;
border-radius: 11px;
background-color: #ca4a1f;
color: #fff;
font-size: 12px;
font-weight: bold;
line-height: 17px;
text-align: center;
z-index: 26;
}

/*
* Tabs
*/
Expand Down Expand Up @@ -132,22 +158,11 @@ ul.config-error li span.dashicons {
color: #000;
}

#contact-form-editor-tabs li a span.dashicons {
font-style: normal;
padding: 6px 0 4px 4px;
color: #82878c;
}

#contact-form-editor-tabs li a span.dashicons-warning,
#contact-form-editor .contact-form-editor-panel > div.config-error span.dashicons-warning {
color: #ca4a1f;
}

#contact-form-editor .contact-form-editor-panel > div.config-error {
margin-bottom: 1.4em;
}

#contact-form-editor-tabs li.ui-tabs-active a span.dashicons {
#contact-form-editor-tabs li.ui-tabs-active a .icon-in-circle {
display: none;
}

Expand Down Expand Up @@ -327,10 +342,6 @@ ul.config-error li span.dashicons {
width: 38%;
}

.wp-list-table .config-error span.dashicons-warning {
color: #ca4a1f;
}

/*
* Welcome Panel
*/
Expand Down Expand Up @@ -422,3 +433,7 @@ ul.config-error li span.dashicons {
.card .inside .form-table td {
padding: 10px 10px;
}

.card .checkboxes li {
margin: 0;
}
43 changes: 22 additions & 21 deletions wp-content/plugins/contact-form-7/admin/edit-contact-form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function wpcf7_admin_save_button( $post_id ) {
echo $button;
}

?><div class="wrap">
?><div class="wrap" id="wpcf7-contact-form-editor">

<h1 class="wp-heading-inline"><?php
if ( $post->initial() ) {
Expand All @@ -40,17 +40,31 @@ function wpcf7_admin_save_button( $post_id ) {
?></h1>

<?php
if ( ! $post->initial() && current_user_can( 'wpcf7_edit_contact_forms' ) ) {
echo sprintf( '<a href="%1$s" class="add-new-h2">%2$s</a>',
esc_url( menu_page_url( 'wpcf7-new', false ) ),
esc_html( __( 'Add New', 'contact-form-7' ) ) );
if ( ! $post->initial()
and current_user_can( 'wpcf7_edit_contact_forms' ) ) {
echo wpcf7_link(
menu_page_url( 'wpcf7-new', false ),
__( 'Add New', 'contact-form-7' ),
array( 'class' => 'page-title-action' )
);
}
?>

<hr class="wp-header-end">

<?php do_action( 'wpcf7_admin_warnings' ); ?>
<?php do_action( 'wpcf7_admin_notices' ); ?>
<?php
do_action( 'wpcf7_admin_warnings',
$post->initial() ? 'wpcf7-new' : 'wpcf7',
wpcf7_current_action(),
$post
);

do_action( 'wpcf7_admin_notices',
$post->initial() ? 'wpcf7-new' : 'wpcf7',
wpcf7_current_action(),
$post
);
?>

<?php
if ( $post ) :
Expand Down Expand Up @@ -187,23 +201,10 @@ function wpcf7_admin_save_button( $post_id ) {
__( 'https://wordpress.org/support/plugin/contact-form-7/', 'contact-form-7' ),
__( 'Support Forums', 'contact-form-7' )
); ?></li>
<?php
$pro_service_langs = array(
'en', // English
'de', // German
'fr', // French
'es', // Spanish
);

if ( in_array( substr( get_user_locale(), 0, 2 ), $pro_service_langs ) ) :
?>
<li><?php echo wpcf7_link(
__( 'https://contactform7.com/custom-development/', 'contact-form-7' ),
__( 'Professional Services', 'contact-form-7' )
); ?></li>
<?php
endif;
?>
</ol>
</div>
</div><!-- #informationdiv -->
Expand Down Expand Up @@ -253,8 +254,8 @@ function wpcf7_admin_save_button( $post_id ) {

$panels['additional-settings-panel'] = array(
'title' => $additional_settings
/* translators: %d: number of additional settings */
? sprintf(
/* translators: %d: number of additional settings */
__( 'Additional Settings (%d)', 'contact-form-7' ),
$additional_settings )
: __( 'Additional Settings', 'contact-form-7' ),
Expand Down
4 changes: 2 additions & 2 deletions wp-content/plugins/contact-form-7/admin/includes/admin-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

function wpcf7_current_action() {
if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
if ( isset( $_REQUEST['action'] ) and -1 != $_REQUEST['action'] ) {
return $_REQUEST['action'];
}

if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
if ( isset( $_REQUEST['action2'] ) and -1 != $_REQUEST['action2'] ) {
return $_REQUEST['action2'];
}

Expand Down
Loading