diff --git a/wordpress/wp-admin/js/post.js b/wordpress/wp-admin/js/post.js index 096ae2fe07f9d7118088e5ea6f8c47ef6dfc5589..516c9ab87734c8638eaba756e8cf5a929fbb7b00 100644 --- a/wordpress/wp-admin/js/post.js +++ b/wordpress/wp-admin/js/post.js @@ -713,9 +713,6 @@ jQuery(document).ready( function($) { if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) { publishOn = postL10n.publishOnFuture; $('#publish').val( postL10n.schedule ); - } else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) { - publishOn = postL10n.publishOn; - $('#publish').val( postL10n.publish ); } else { publishOn = postL10n.publishOnPast; $('#publish').val( postL10n.update ); diff --git a/wordpress/wp-config.default.php b/wordpress/wp-config.default.php deleted file mode 100644 index b827b155dee671267f19fde97fa708a6cf3bf6f8..0000000000000000000000000000000000000000 --- a/wordpress/wp-config.default.php +++ /dev/null @@ -1,101 +0,0 @@ -ID, $field['id'], 'multicheck' != $field['type'] /* If multicheck this can be multiple values */ ); + if ( $field['type'] == "wrapper_start" ) { + echo '
'; + continue; + } + if ( $field['type'] == "wrapper_end" ) { + echo '
'; + continue; + } if ( $field['type'] == "level1wraptop" ) { - echo '

'.$GLOBALS["tr_Level"].' 1

'; + echo '
'; } if ( $field['type'] == "level1wrapbottom" ) { echo '
'; } if ( $field['type'] == "level2wraptop" ) { - echo '

What we’re installing 1

'; + echo '
'; } if ( $field['type'] == "level2wrapbottom" ) { echo '
'; } if ( $field['type'] == "level3wraptop" ) { - echo '

Project Timeline 1

'; + echo '
'; } if ( $field['type'] == "level3wrapbottom" ) { echo '
'; @@ -150,23 +158,23 @@ class ign_cmb_Meta_Box { echo '
  • '; if ( $field['type'] == "title" ) { - echo '
    ', $field['desc'], ''; + } else if ( $field['type'] == "subtitle" ) { + echo '
    ', $field['name'], '', $field['desc'], '
    '; + } else if ($field['type'] == 'checkbox') { echo '
    ', $field['desc'], '
    '; echo ''; echo ' '; echo ' [?]'; - } - else { + } else { if( $field['show_help'] == true ) { - echo ' [?] -
    ', $field['desc'], '
    - '; + echo '[?] +
    ', $field['desc'], '
    '; } - else { - echo ''; + else if($field['name']){ + echo ''; } echo '
    '; } @@ -205,8 +213,8 @@ class ign_cmb_Meta_Box { break; case 'select': echo ''; echo ' '; @@ -239,10 +247,6 @@ class ign_cmb_Meta_Box { echo ''; echo ' '; break; - case 'title': - echo '
    ', $field['name'], '
    '; - echo ' '; - break; case 'wysiwyg': echo '
    '; echo '
    '; @@ -286,9 +290,8 @@ class ign_cmb_Meta_Box { $check_image = preg_match( '/(^.*\.jpg|jpeg|png|gif|ico*)/i', $meta ); if ( $check_image ) { echo '
    '; - echo '
    '; + echo ''; echo 'Remove Image
    '; - echo '
    '; } else { $parts = explode( "/", $meta ); for( $i = 0; $i < sizeof( $parts ); ++$i ) { @@ -318,13 +321,12 @@ class ign_cmb_Meta_Box { $meta_short_desc = stripslashes(get_post_meta( $post->ID, $name="ign_product_level_".($i)."_short_desc", true )); $meta_desc = stripslashes(get_post_meta( $post->ID, $name="ign_product_level_".($i)."_desc", true )); $levels_html .= ''. - '

    '.__('Level', 'ignitiondeck').' '.($i).'

    '. - '
    '. - '
    '. - '
    '. - '
    ' . - '
    '. - '
    '. + '
    '. + '
    '. + '
    '. + '
    ' . + '
    '. + '
    '. '
    '; $levels_html .= '
    '; } @@ -345,7 +347,7 @@ class ign_cmb_Meta_Box { echo apply_filters('id_product_levels_html_admin', $levels_html, $meta_no_levels, $post->ID); break; case 'add_levels': - echo ' '; + echo ''; break; ////Project What we’re installing line html form start here case 'product_levels_2': @@ -363,8 +365,7 @@ class ign_cmb_Meta_Box { $meta_order = 0; } $levels_html_2 .= ''. - '

    '.__('What we’re installing ', 'ignitiondeck').' '.($i).'

    '. - '
    '. + '

    '.__('Item ', 'ignitiondeck').' '.($i).'

    '. '
    '. '
    '; $levels_html_2 .= '
    '; @@ -378,7 +379,7 @@ class ign_cmb_Meta_Box { echo apply_filters('id_product_levels_2_html_admin', $levels_html_2, $meta_no_levels_2, $post->ID); break; case 'add_levels_2': - echo ' '; + echo ''; break; ////Project What we’re installing line html form end here ////Project Timeline multiple line html form start here @@ -397,10 +398,11 @@ class ign_cmb_Meta_Box { $meta_order = 0; } $levels_html_3 .= ''. - '

    '.__('Project Timeline ', 'ignitiondeck').' '.($i).'

    '. - '
    '. - '
    '. - '
    '; + '
    '.__('Event ', 'ignitiondeck').' '.($i).'
    '. + '
    '. + ''. + ''. + '
    '; $levels_html_3 .= '
    '; } @@ -412,23 +414,20 @@ class ign_cmb_Meta_Box { echo apply_filters('id_product_levels_3_html_admin', $levels_html_3, $meta_no_levels_3, $post->ID); break; case 'add_levels_3': - echo ' '; + echo ''; break; ////Project Timeline multiple line html form End here case 'short_code': - echo '
    + echo '
    '; - break; + break; case 'headline1': echo '

    '.$GLOBALS["tr_Headline1"].'

    '; - break; - case 'headline2': - echo '

    '.$GLOBALS["tr_Headline2"].'

    '; - break; + break; case 'headline2': echo '

    '.$GLOBALS["tr_Headline2"].'

    '; - break; + break; } echo '','
  • '; } @@ -766,7 +765,7 @@ function ign_cmb_editor_footer_scripts() { jQuery('div[levels]').attr('levels', element_number); jQuery('#levels').val(element_number); jQuery('div[levels]').append('
    ' + - '

    '+(element_number)+'

    '+ + '
    '+ '
    ' + '
    ' + '
    ' + @@ -791,10 +790,9 @@ function ign_cmb_editor_footer_scripts() { var pre_element_number = element_number - 1; jQuery('div[levels_2]').attr('levels_2', element_number); jQuery('#levels_2').val(element_number); - jQuery('div[levels_2]').append('
    ' + - '

    '+(element_number)+'

    '+ - '
    ' + - '
    '); + jQuery('div[levels_2]').append('
    ' + + '' + + '
    '); }); // Add What we’re installing js code end here // Add Project Timeline js code start here @@ -805,9 +803,11 @@ function ign_cmb_editor_footer_scripts() { jQuery('div[levels_3]').attr('levels_3', element_number); jQuery('#levels_3').val(element_number); jQuery('div[levels_3]').append('
    ' + - '

    '+(element_number)+'

    '+ - '
    ' + - '
    '); + '
    '+(element_number)+'
    ' + + '
    ' + + ''+ + '' + + '
    '); }); // Add Project Timeline js code end here }); diff --git a/wordpress/wp-content/plugins/ignitiondeck-crowdfunding/ignitiondeck-admin.css b/wordpress/wp-content/plugins/ignitiondeck-crowdfunding/ignitiondeck-admin.css index a9c691e3052d851c785fbfd7919b559b6f3481c6..8337b1e5d80b564ec75ddcdbcdb14e0b575b42da 100644 --- a/wordpress/wp-content/plugins/ignitiondeck-crowdfunding/ignitiondeck-admin.css +++ b/wordpress/wp-content/plugins/ignitiondeck-crowdfunding/ignitiondeck-admin.css @@ -48,6 +48,12 @@ width: 100%; clear: both; } +.wrap ul li.ign_projectmeta_full.new_levels{ + padding: 0 0 10px; +} +.wrap ul li.ign_projectmeta_full input[type=text]{ + width: 97%; +} .wrap ul li.ign_projectmeta_full .customEditor { padding: 1px; border: 1px solid #c9c9c9; @@ -62,8 +68,8 @@ width: 450px; margin: 10px 0; } -.wrap .ign_file_upload .upload_button { - margin-top: 10px; +.wrap .img_status{ + margin: 10px; } .wrap .ign_file_upload_image { padding: 0; @@ -99,24 +105,19 @@ } .wrap .ign_projectmeta_reward_price { padding: 0; - margin: 0; + margin: 0 0 10px; float: left; width: 20%; clear: both; } .wrap .ign_projectmeta_reward_limit { padding: 0; - margin: 0; + margin: 0 0 10px; float: left; width: 20%; clear: left; } -.wrap .ign_projectmeta_reward_left .ign_projectmeta_reward_limit { - margin-top: 65px; -} -.wrap .ign_projectmeta_reward_left .ign_projectmeta_reward_limit:last-child { - margin-top: 0; -} + .wrap .ign_projectmeta_reward_desc { padding: 0; margin: 0 2% 0 0; @@ -138,9 +139,11 @@ display: block; } .wrap .projectmeta-levelbox { - background-color: #f2f3f5; - margin-bottom: 10px; - padding: 8px; + margin: 0 0 10px; + padding: 0 0 30px; +} +.wrap .projectmeta-levelbox .ign_projectmeta_full{ + padding: 0; } .wrap .projectmeta_none { display: none ; @@ -159,6 +162,7 @@ } .wrap .projectmeta-levelbox label { font-weight: bold; + margin: 10px 0; } .new_levels h4 { diff --git a/wordpress/wp-content/themes/backer/css/admin-style.css b/wordpress/wp-content/themes/backer/css/admin-style.css index 57e55499585fc1dec7509cf48e155de24ed9c9fd..99775dfba14cf3a240caa1aed939f40e37352abe 100644 --- a/wordpress/wp-content/themes/backer/css/admin-style.css +++ b/wordpress/wp-content/themes/backer/css/admin-style.css @@ -1,3 +1,68 @@ +#poststuff #postbox-container-2 h3{ + font-size: 1.25rem; +} +#poststuff #post-body.columns-2{ + margin-right: 30%; +} +#post-body.columns-2 #postbox-container-1 { + float: right; + margin-right: -43%; + width: 40%; +} +#poststuff #post-body.columns-2 #side-sortables{ + width: auto; +} +.metabox-holder label { + font-weight: bold; + margin-bottom: 10px; + display: inline-block; +} +.metabox-holder label span{ + display: block; + font-weight: normal; +} +.metabox-holder h4{ + margin: 1rem 0; + font-size: 1.2rem; + line-height: 1.5rem; +} +.metabox-holder h4 span{ + display: block; + font-weight: normal; + font-size: .85rem; +} +.metabox-holder h5{ + margin: 1rem 0 0; + font-size: 1rem; + line-height: 1rem; + font-weight: bold; +} +.metabox-holder h5 span{ + display: block; + font-weight: normal; + font-size: .85rem; +} +.metabox-holder .new_levels_2{ + padding: 0; +} +.metabox-holder .new_item{ + padding: 10px 0; +} +.metabox-holder .meta_wrapper{ + margin: 10px 0; + border-top: 1px solid #ccc; +} +.metabox-holder .ign_projectmeta_left{ + float: none; +} +.metabox-holder .ign_projectmeta_left label{ + margin-bottom: 10px; + display: inline-block; +} +.metabox-holder .ign_projectmeta_full{ + padding: 10px 0; + width: 100%; +} #wp-admin-bar-vc-inline-admin-bar-link, td.column-title .edit_vc, .composer-switch .wpb_switch-to-front-composer, .composer-switch span.vc-spacer:nth-of-type(3), #wpb-edit-inline, #message.rs-update-notice-wrap, #wpb-custom-post-css, .vc_row_edit_clone_delete .vc_row_image, .vc_admin_label.admin_label_css_animation.hidden-label, .vc-license-activation-notice, #accordion-section-idc_menu_items { display: none !important; } diff --git a/wordpress/wp-content/themes/backer/footer.php b/wordpress/wp-content/themes/backer/footer.php index 91b2d5d7aeb22cd2c091f9f7ebb3bc9221206983..6d174579a3e17562605b95ae03ce41a515e6453a 100644 --- a/wordpress/wp-content/themes/backer/footer.php +++ b/wordpress/wp-content/themes/backer/footer.php @@ -123,7 +123,16 @@ + diff --git a/wordpress/wp-content/themes/backer/functions.php b/wordpress/wp-content/themes/backer/functions.php index 8e2c2ad7989aec79423cc1aa610e8f3df78361ae..7baf8e2cbfb59486a2d9d620fdf1763e478c28d0 100644 --- a/wordpress/wp-content/themes/backer/functions.php +++ b/wordpress/wp-content/themes/backer/functions.php @@ -25,6 +25,8 @@ add_filter( 'ot_header_version_text', 'filter_ot_header_version_text'); Include other files ------------------------------------*/ +include( 'includes/overrides/project-status.php' ); +include( 'includes/overrides/project-edit.php' ); include( 'includes/theme-options.php' ); include( 'includes/customizer-options.php' ); include( 'includes/custom-styles.php' ); @@ -232,7 +234,7 @@ add_action( 'after_setup_theme', 'krown_setup' ); if ( ! function_exists( '_wp_render_title_tag' ) ) { function theme_slug_render_title() { - echo '' . wp_title( '|', false, 'right' ) . "\n"; + echo '' . wp_title( '|', false, 'right' ) . "\n"; } add_action( 'wp_head', 'theme_slug_render_title' ); @@ -432,7 +434,7 @@ if ( ! function_exists( 'krown_excerptlength_post' ) ) { // Length (words no) function krown_excerptlength_post() { - return 15; + return 15; } } @@ -442,7 +444,7 @@ if ( ! function_exists( 'krown_excerptlength_post_big' ) ) { // Length (words no) function krown_excerptlength_post_big() { - return 80; + return 80; } } @@ -452,7 +454,7 @@ if ( ! function_exists( 'krown_excerptmore' ) ) { // More text function krown_excerptmore() { - return ' ...'; + return ' ...'; } } @@ -467,37 +469,37 @@ if ( ! function_exists( 'krown_excerpt' ) ) { function krown_excerpt( $length_callback = '', $more_callback = 'krown_excerptmore' ) { - global $post; + global $post; - if ( function_exists( $length_callback ) ) { + if ( function_exists( $length_callback ) ) { add_filter( 'excerpt_length', $length_callback ); - } + } - if ( function_exists( $more_callback ) ){ + if ( function_exists( $more_callback ) ){ add_filter( 'excerpt_more', $more_callback ); - } + } - $output = get_the_excerpt(); + $output = get_the_excerpt(); - if ( empty( $output ) ) { + if ( empty( $output ) ) { - // If the excerpt is empty (on pages created 100% with shortcodes), we should take the content, strip shortcodes, remove all HTML tags, then return the correct number of words + // If the excerpt is empty (on pages created 100% with shortcodes), we should take the content, strip shortcodes, remove all HTML tags, then return the correct number of words - $output = strip_tags( preg_replace( "~(?:\[/?)[^\]]+/?\]~s", '', $post->post_content ) ); - $output = explode( ' ', $output, $length_callback() ); - array_pop( $output ); - $output = implode( ' ', $output ) . $more_callback(); + $output = strip_tags( preg_replace( "~(?:\[/?)[^\]]+/?\]~s", '', $post->post_content ) ); + $output = explode( ' ', $output, $length_callback() ); + array_pop( $output ); + $output = implode( ' ', $output ) . $more_callback(); - } else { + } else { - // Continue with the regular excerpt method + // Continue with the regular excerpt method - $output = apply_filters( 'wptexturize', $output ); - $output = apply_filters( 'convert_chars', $output ); + $output = apply_filters( 'wptexturize', $output ); + $output = apply_filters( 'convert_chars', $output ); - } + } - return $output; + return $output; } @@ -535,13 +537,13 @@ if ( ! function_exists( 'krown_search_form' ) ) { function krown_search_form( $form ) { - $form = ' + $form = ' '; - return $form; + '; + return $form; } @@ -772,9 +774,9 @@ if ( ! function_exists( 'krown_custom_header' ) ) { ------------------------------------*/ function krown_custom_login_logo() { - echo ''; + echo ''; } add_action( 'login_head', 'krown_custom_login_logo' ); @@ -863,11 +865,11 @@ function krown_sidebar_class() { function krown_request_filter( $query_vars ) { - if( isset( $_GET['s'] ) && empty( $_GET['s'] ) ) { - $query_vars['s'] = " "; - } + if( isset( $_GET['s'] ) && empty( $_GET['s'] ) ) { + $query_vars['s'] = " "; + } - return $query_vars; + return $query_vars; } add_filter('request', 'krown_request_filter'); @@ -1006,21 +1008,21 @@ if ( ! function_exists( 'krown_mce_custom_styles' ) ) { function krown_mce_custom_styles($settings) { - $settings['theme_advanced_blockformats'] = 'p,h1,h2,h3,h4'; + $settings['theme_advanced_blockformats'] = 'p,h1,h2,h3,h4'; - $style_formats = array( - array('title' => 'Extreme', 'inline' => 'span', 'classes' => 'extreme'), - array('title' => 'Large', 'inline' => 'span', 'classes' => 'large'), - array('title' => 'Medium', 'inline' => 'span', 'classes' => 'medium'), - array('title' => 'Regular', 'inline' => 'span', 'classes' => 'regular'), - array('title' => 'Small', 'inline' => 'span', 'classes' => 'small'), - array('title' => 'Cite', 'inline' => 'cite', 'classes' => '') - ); + $style_formats = array( + array('title' => 'Extreme', 'inline' => 'span', 'classes' => 'extreme'), + array('title' => 'Large', 'inline' => 'span', 'classes' => 'large'), + array('title' => 'Medium', 'inline' => 'span', 'classes' => 'medium'), + array('title' => 'Regular', 'inline' => 'span', 'classes' => 'regular'), + array('title' => 'Small', 'inline' => 'span', 'classes' => 'small'), + array('title' => 'Cite', 'inline' => 'cite', 'classes' => '') + ); - $settings['style_formats'] = json_encode( $style_formats ); + $settings['style_formats'] = json_encode( $style_formats ); - return $settings; - + return $settings; + } } @@ -1047,7 +1049,7 @@ if ( ! function_exists( 'krown_mce_buttons' ) ) { function krown_mce_buttons( $buttons ) { array_unshift( $buttons, 'fontsizeselect' ); - array_unshift( $buttons, 'styleselect'); + array_unshift( $buttons, 'styleselect'); return $buttons; } @@ -1056,7 +1058,7 @@ if ( ! function_exists( 'krown_mce_buttons' ) ) { add_filter( 'mce_buttons_2', 'krown_mce_buttons' ); /*--------------------------------- - Update Notice + Update Notice ------------------------------------*/ add_action( 'admin_notices', 'krown_update_notice' ); @@ -1065,12 +1067,12 @@ function krown_update_notice() { if ( get_option( 'krown_koncept_version' ) != '1.1' ) { - echo '
    -

    You have just updated to version 1.1 - Read the CHANGELOG

    '; + echo '
    +

    You have just updated to version 1.1 - Read the CHANGELOG

    '; - printf(__('Dismiss'), '?krown_update_done_do=1'); + printf(__('Dismiss'), '?krown_update_done_do=1'); - echo "

    "; + echo "

    "; } @@ -1079,99 +1081,99 @@ add_action( 'admin_init', 'krown_update_done_do' ); function krown_update_done_do() { global $current_user; - $user_id = $current_user->ID; - if ( isset( $_GET['krown_update_done_do'] ) && '1' == $_GET['krown_update_done_do'] ) { - update_option( 'krown_koncept_version', '1.1' ); + $user_id = $current_user->ID; + if ( isset( $_GET['krown_update_done_do'] ) && '1' == $_GET['krown_update_done_do'] ) { + update_option( 'krown_koncept_version', '1.1' ); } } /*--------------------------------- - Navigation Walker + Navigation Walker ------------------------------------*/ class Krown_Nav_Walker extends Walker_Nav_Menu { - function start_lvl( &$output, $depth=0, $args=array() ) { - if ( $depth == 0 ) { - $output .= '