Skip to content

Commit

Permalink
Merge pull request #109 from WP-for-Church/dev
Browse files Browse the repository at this point in the history
Release 2.7
  • Loading branch information
Nikola Miljković authored Sep 27, 2017
2 parents 64409d6 + 7c793ed commit 6eeed8b
Show file tree
Hide file tree
Showing 51 changed files with 8,476 additions and 7,735 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
1 change: 1 addition & 0 deletions README.md
112 changes: 112 additions & 0 deletions css/error-recovery.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions css/error-recovery.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

135 changes: 135 additions & 0 deletions css/error-recovery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
#sm-fatal-error-notice.loading {
position: relative;

#sm-curtain {
width: 100%;
height: 100%;
background: #ffffff;
opacity: .7;
}

#sm-spinner {
opacity: 1;
}
}

#sm-curtain {
position: absolute;
top: 0;
left: 0;
opacity: 0;
background: transparent;
transition: opacity .5s;

&.dialog {
transition: none;
position: fixed;
z-index: 99999;
background: #fff;
opacity: .8;
width: 100%;
height: 100%;
}
}

#sm-spinner {
z-index: 10;
position: absolute;
top: 50%;
transform: translate(-50%, -50%);
left: 50%;
opacity: 0;
transition: opacity 1s;
}

#sm-disable-recovery-notice {
color: #e29300;

> a {
color: #a26300
}
}

#sm-error {
background-color: #01354e;
color: #ffffff;
padding: .5rem;
}

.ui-dialog {
box-shadow: 0 -2px 25px 0 rgba(0, 0, 0, 0.15), 0 13px 25px 0 rgba(0, 0, 0, 0.3);
background-color: #FFFFFF;
margin: 0 auto;
width: auto;
height: auto;
border-radius: 2px 2px 0 0;
padding: 21px 24px 12px;
z-index: 100000;
}

.ui-dialog-titlebar {
font-family: 'Roboto', sans-serif;
font-weight: 500;
font-size: 20px;
color: rgba(0, 0, 0, .8);
line-height: 24px;
text-align: left;
letter-spacing: 0.03px;
}

.ui-dialog-content {
font-size: 13px;
color: rgba(0, 0, 0, .5);
line-height: 24px;
text-align: left;
letter-spacing: 0.03px;
padding: 14px 0 0;

textarea, input[type="email"] {
width: 100%;
}
}

.ui-dialog-titlebar-close {
display: none;
}

.ui-dialog-buttonpane {
width: auto;
height: 48px;
background-color: #FFFFFF;
text-align: right;
border-radius: 0 0 2px 2px;
padding: 8px 0 0 16px;
}

.ui-dialog-buttonset > button {
display: inline-block;
height: 36px;
background-color: rgba(9, 9, 9, 0);
font-weight: 500;
font-size: 16px;
color: rgba(33, 150, 243, 0.9);
line-height: 36px;
text-align: center;
letter-spacing: 0.4px;
padding: 0 8px;
margin: 6px 4px;
text-transform: uppercase;
outline: none;
border: none;
cursor: pointer;
transition: all 0.2s ease;

&:last-child {
margin-right: 0;
}
}

.ui-dialog-buttonset > button:hover {
background-color: rgba(99, 99, 99, 0.2);
}

.ui-dialog-buttonset > button:active {
background-color: rgba(99, 99, 99, 0.4);
}
4 changes: 4 additions & 0 deletions css/sermon.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@
display: block;
}

.widget_recent_sermons .meta > span {
display: inline;
}

#sermon-navigation {
padding-bottom: 15px;
}
Expand Down
3 changes: 2 additions & 1 deletion includes/CMB2/includes/types/CMB2_Type_Text_Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ class CMB2_Type_Text_Date extends CMB2_Type_Picker_Base {
public function render() {
$args = $this->parse_args( 'text_date', array(
'class' => 'cmb2-text-small cmb2-datepicker',
'value' => $this->field->get_timestamp_format(),
'value' => isset( $_GET['post'] ) ? ( get_post_meta( $_GET['post'], 'sermon_date_auto', true ) ? '' : $this->field->get_timestamp_format() ) : '',
'desc' => $this->_desc(),
'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
'placeholder' => isset( $_GET['post'] ) ? ( get_post_meta( $_GET['post'], 'sermon_date_auto', true ) ? $this->field->get_timestamp_format() : '' ) : $this->field->get_timestamp_format( 'date_format', time() ),
) );

if ( false === strpos( $args['class'], 'timepicker' ) ) {
Expand Down
37 changes: 19 additions & 18 deletions includes/admin-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,19 @@ function wpfc_sermon_updated_messages( $messages ) {

$messages['wpfc_sermon'] = array(
0 => '', // Unused. Messages start at index 1.
1 => sprintf( __( 'Sermon updated. <a href="%s">View sermon</a>', 'sermon-manager' ), esc_url( get_permalink( $post_ID ) ) ),
2 => __( 'Custom field updated.', 'sermon-manager' ),
3 => __( 'Custom field deleted.', 'sermon-manager' ),
4 => __( 'Sermon updated.', 'sermon-manager' ),
1 => sprintf( __( 'Sermon updated. <a href="%s">View sermon</a>', 'sermon-manager-for-wordpress' ), esc_url( get_permalink( $post_ID ) ) ),
2 => __( 'Custom field updated.', 'sermon-manager-for-wordpress' ),
3 => __( 'Custom field deleted.', 'sermon-manager-for-wordpress' ),
4 => __( 'Sermon updated.', 'sermon-manager-for-wordpress' ),
/* translators: %s: date and time of the revision */
5 => isset( $_GET['revision'] ) ? sprintf( __( 'Sermon restored to revision from %s', 'sermon-manager' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
6 => sprintf( __( 'Sermon published. <a href="%s">View sermon</a>', 'sermon-manager' ), esc_url( get_permalink( $post_ID ) ) ),
7 => __( 'Sermon saved.', 'sermon-manager' ),
8 => sprintf( __( 'Sermon submitted. <a target="_blank" href="%s">Preview sermon</a>', 'sermon-manager' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
9 => sprintf( __( 'Sermon scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview sermon</a>', 'sermon-manager' ),
5 => isset( $_GET['revision'] ) ? sprintf( __( 'Sermon restored to revision from %s', 'sermon-manager-for-wordpress' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
6 => sprintf( __( 'Sermon published. <a href="%s">View sermon</a>', 'sermon-manager-for-wordpress' ), esc_url( get_permalink( $post_ID ) ) ),
7 => __( 'Sermon saved.', 'sermon-manager-for-wordpress' ),
8 => sprintf( __( 'Sermon submitted. <a target="_blank" href="%s">Preview sermon</a>', 'sermon-manager-for-wordpress' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
9 => sprintf( __( 'Sermon scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview sermon</a>', 'sermon-manager-for-wordpress' ),
// translators: Publish box date format, see http://php.net/date
date_i18n( __( 'M j, Y @ G:i', 'sermon-manager' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ) ),
10 => sprintf( __( 'Sermon draft updated. <a target="_blank" href="%s">Preview sermon</a>', 'sermon-manager' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
date_i18n( __( 'M j, Y @ G:i', 'sermon-manager-for-wordpress' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ) ),
10 => sprintf( __( 'Sermon draft updated. <a target="_blank" href="%s">Preview sermon</a>', 'sermon-manager-for-wordpress' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ),
);

return $messages;
Expand Down Expand Up @@ -186,13 +186,14 @@ function wpfc_sermon_order( $vars ) {
function wpfc_sermon_edit_columns() {
$columns = array(
"cb" => "<input type=\"checkbox\" />",
"title" => __( 'Sermon Title', 'sermon-manager' ),
"preacher" => __( \SermonManager::getOption( 'preacher_label' ) ?: 'Preacher', 'sermon-manager' ),
"series" => __( 'Sermon Series', 'sermon-manager' ),
"topics" => __( 'Topics', 'sermon-manager' ),
"views" => __( 'Views', 'sermon-manager' ),
"preached" => __( 'Date Preached', 'sermon-manager' ),
"passage" => __( 'Bible Passage', 'sermon-manager' ),
"title" => __( 'Sermon Title', 'sermon-manager-for-wordpress' ),
/* Translators: %s: Preacher label (sentence case; singular) */
"preacher" => sprintf( __( '%s', 'sermon-manager-for-wordpress' ), ucwords(\SermonManager::getOption( 'preacher_label' ) ) ?: 'Preacher' ),
"series" => __( 'Sermon Series', 'sermon-manager-for-wordpress' ),
"topics" => __( 'Topics', 'sermon-manager-for-wordpress' ),
"views" => __( 'Views', 'sermon-manager-for-wordpress' ),
"preached" => __( 'Date Preached', 'sermon-manager-for-wordpress' ),
"passage" => __( 'Bible Passage', 'sermon-manager-for-wordpress' ),
);

return $columns;
Expand Down
Loading

0 comments on commit 6eeed8b

Please sign in to comment.