Skip to content

Commit

Permalink
Merge pull request #324 from Codeinwp/development
Browse files Browse the repository at this point in the history
Improved the onboarding process
Fixed issue with the read more button not appearing for the articles using the read more tag
Recommend the WeGlot plugin
  • Loading branch information
rodica-andronache authored Jan 21, 2019
2 parents 82e464e + 629b06c commit 4d5f5d9
Show file tree
Hide file tree
Showing 28 changed files with 11,064 additions and 9,505 deletions.
2 changes: 1 addition & 1 deletion assets/scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Theme URI: https://themeisle.com/themes/neve/
Author: ThemeIsle
Author URI: https://themeisle.com
Description: Neve is a super fast, easily customizable, multi-purpose theme. It’s perfect for blogs, small business, startups, agencies, firms, e-commerce shops (WooCommerce storefront) as well as personal portfolio sites and most types of projects. A fully AMP optimized and responsive theme, Neve will load in mere seconds and adapt perfectly on any viewing device. While it is lightweight and has a minimalist design, the theme is highly extendable, it has a highly SEO optimized code, resulting in top rankings in Google search results. Neve works perfectly with Gutenberg and the most popular page builders (Elementor, Brizy, Beaver Builder, Visual Composer, SiteOrigin, Divi). Neve is also WooCommerce ready, responsive, RTL & translation ready. Look no further. Neve is the perfect theme for you!
Version: 1.0.28
Version: 1.0.29
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: neve
Expand Down
2 changes: 1 addition & 1 deletion functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @package Neve
*/

define( 'NEVE_VERSION', '1.0.28' );
define( 'NEVE_VERSION', '1.0.29' );
define( 'NEVE_INC_DIR', trailingslashit( get_template_directory() ) . 'inc/' );
define( 'NEVE_ASSETS_URL', trailingslashit( get_template_directory_uri() ) . 'assets/' );

Expand Down
4 changes: 4 additions & 0 deletions inc/core/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public function do_about_page() {
'otter-blocks',
'elementor',
'wp-product-review',
'weglot',
'visualizer',
'wpforms-lite',
'translatepress-multilingual',
Expand Down Expand Up @@ -354,6 +355,9 @@ public function welcome_notice_content() {
color: inherit;
text-decoration: none;
}
.nv-notice-text .button.button-primary:active {
vertical-align: inherit;
}
.nv-notice-text p.ti-return-dashboard {
margin-top: 30px;
}
Expand Down
26 changes: 16 additions & 10 deletions inc/core/front_end.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,24 @@ private function get_ti_demo_content_support_data() {
),
'can_migrate' => array(
'zerif-pro' => array(
'theme_name' => 'Zelle Pro',
'theme_mod_check' => 'zelle_frontpage_was_imported',
'template' => 'zelle',
'heading' => __( 'Want to keep using Zelle\'s homepage?', 'neve' ),
'description' => __( 'Hi! We\'ve noticed you were using Zelle before. To make your transition easier, we can help you keep the same beautiful homepage you had before, by converting it into an Elementor template. This option will also import your homepage content.', 'neve' ),
'theme_name' => 'Zelle Pro',
'theme_mod_check' => 'zelle_frontpage_was_imported',
'template' => 'zelle',
'heading' => __( 'Want to keep using Zelle\'s homepage?', 'neve' ),
'description' => __( 'Hi! We\'ve noticed you were using Zelle before. To make your transition easier, we can help you keep the same beautiful homepage you had before, by converting it into an Elementor template. This option will also import your homepage content.', 'neve' ),
'mandatory_plugins' => array(
'elementor' => 'Elementor Page Builder',
),
),
'zerif-lite' => array(
'theme_name' => 'Zelle Lite',
'theme_mod_check' => 'zelle_frontpage_was_imported',
'template' => 'zelle',
'heading' => __( 'Want to keep using Zelle\'s homepage?', 'neve' ),
'description' => __( 'Hi! We\'ve noticed you were using Zelle before. To make your transition easier, we can help you keep the same beautiful homepage you had before, by converting it into an Elementor template. This option will also import your homepage content.', 'neve' ),
'theme_name' => 'Zelle Lite',
'theme_mod_check' => 'zelle_frontpage_was_imported',
'template' => 'zelle',
'heading' => __( 'Want to keep using Zelle\'s homepage?', 'neve' ),
'description' => __( 'Hi! We\'ve noticed you were using Zelle before. To make your transition easier, we can help you keep the same beautiful homepage you had before, by converting it into an Elementor template. This option will also import your homepage content.', 'neve' ),
'mandatory_plugins' => array(
'elementor' => 'Elementor Page Builder',
),
),
),
'i18n' => array(
Expand Down
10 changes: 7 additions & 3 deletions inc/views/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ private function get_nav_menu_cart( $responsive = false ) {
if ( ! class_exists( 'WooCommerce' ) ) {
return '';
}
if ( is_cart() ) {
return '';
}

$tag = 'li';
$class = 'menu-item-nav-cart';
if ( $responsive === true ) {
Expand All @@ -131,6 +129,12 @@ private function get_nav_menu_cart( $responsive = false ) {
$cart .= '<span class="screen-reader-text">' . __( 'Cart', 'neve' ) . '</span>';
$cart .= '<span class="cart-count">' . WC()->cart->get_cart_contents_count() . '</span>';
$cart .= '</a>';

if ( is_cart() || is_checkout() ) {
$cart .= '</' . esc_attr( $tag ) . '>';
return $cart;
}

if ( $responsive === false ) {
ob_start();
echo '<div class="nv-nav-cart">';
Expand Down
7 changes: 5 additions & 2 deletions inc/views/partials/excerpt.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,16 @@ private function get_post_excerpt( $context ) {
* @return string
*/
private function get_excerpt( $length = 25 ) {

global $post;

if ( $length === 300 ) {
$content = get_the_content( '', '&hellip;' );
$content = get_the_content();

return $content;
}

if ( strpos( get_the_content(), '<!--more-->' ) ) {
if ( strpos( $post->post_content, '<!--more-->' ) ) {
$content = apply_filters( 'the_content', get_the_content() );

return $content;
Expand Down
18 changes: 12 additions & 6 deletions inc/views/template_parts.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Template_Parts extends Base_View {
public function init() {
add_action( 'neve_blog_post_template_part_content', array( $this, 'render_post' ) );
add_filter( 'excerpt_more', array( $this, 'link_excerpt_more' ) );
add_filter( 'the_content_more_link', array( $this, 'link_excerpt_more' ) );
}

/**
Expand Down Expand Up @@ -194,14 +195,19 @@ private function get_grid_columns_class() {
* @return string
*/
public function link_excerpt_more( $moretag ) {
$moretag = '';

$moretag .= '&hellip;&nbsp;<a href="' . esc_url( get_the_permalink() ) . '" rel="bookmark">';
$new_moretag = '&hellip;&nbsp;';

$moretag .= esc_html__( 'Read More', 'neve' );
$moretag .= '<span class="screen-reader-text">' . get_the_title() . '</span>';
$moretag .= ' &raquo;</a>';
if ( isset( $moretag ) && ( $moretag !== ' [&hellip;]' ) ) {
$new_moretag = '';
}

$new_moretag .= '<a href="' . esc_url( get_the_permalink() ) . '" rel="bookmark">';

$new_moretag .= esc_html__( 'Read More', 'neve' );
$new_moretag .= '<span class="screen-reader-text">' . get_the_title() . '</span>';
$new_moretag .= ' &raquo;</a>';

return $moretag;
return $new_moretag;
}
}
106 changes: 105 additions & 1 deletion onboarding/neve-charity/data.json
Original file line number Diff line number Diff line change
@@ -1 +1,105 @@
{"theme_mods":{"ti_prev_theme":"twentysixteen","custom_css_post_id":16,"background_color":"ffffff","neve_menu_item_color":"#ffffff","neve_navigation_layout":"left","neve_last_menu_item":"none","neve_menu_item_hover_color":"#ffffff","neve_button_color":"#404248","neve_link_color":"#076442","neve_link_hover_color":"#404248","neve_blog_archive_container_style":"contained","neve_blog_archive_layout":"alternative","neve_default_sidebar_layout":"full-width","neve_sitewide_content_width":80,"neve_body_font_family":"","neve_headings_font_family":"Montserrat","neve_footer_text":"<a href=\"https:\/\/themeisle.com\/themes\/neve\/\" target=\"_blank\" rel=\"nofollow\">Neve Charity<\/a> | Powered by <a href=\"http:\/\/wordpress.org\" rel=\"nofollow\">WordPress<\/a>","neve_footer_widget_columns":2,"neve_text_color":"#404248","neve_generated_style_version":1544175692,"__ti_import_menus_location":{"primary":"main"}},"widgets":{"blog-sidebar":{"search-2":{"title":""},"recent-posts-2":{"title":"","number":5},"recent-comments-2":{"title":"","number":5},"archives-2":{"title":"","count":0,"dropdown":0},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-2":{"title":""}},"footer-one-widgets":{"nav_menu-2":{"nav_menu":2}},"footer-two-widgets":{"socials-ignited-2":{"title":"","color":"","background_color":"","size":18,"background_size":30,"border_radius":50,"border_color":"","border_width":0,"opacity":1,"new_win":"","nofollow":"","icons":[{"icon":"fa-facebook","url":"#","title":""},{"icon":"fa-twitter","url":"#","title":""},{"icon":"fa-instagram","url":"#","title":""}]}}},"recommended_plugins":{"elementor":"Elementor Page Builder","socials-ignited":"Socials Ignited","themeisle-companion":"Orbit Fox by ThemeIsle"},"front_page":{"front_page":"neve-charity-demo-home","blog_page":"neve-charity-demo-blog"},"shop_pages":null}
{
"theme_mods": {
"ti_prev_theme": "twentysixteen",
"custom_css_post_id": 16,
"background_color": "ffffff",
"neve_menu_item_color": "#ffffff",
"neve_navigation_layout": "left",
"neve_last_menu_item": "none",
"neve_menu_item_hover_color": "#ffffff",
"neve_button_color": "#404248",
"neve_link_color": "#076442",
"neve_link_hover_color": "#404248",
"neve_blog_archive_container_style": "contained",
"neve_blog_archive_layout": "alternative",
"neve_default_sidebar_layout": "full-width",
"neve_sitewide_content_width": 80,
"neve_body_font_family": "",
"neve_headings_font_family": "Montserrat",
"neve_footer_text": "<a href=\"https://themeisle.com/themes/neve/\" target=\"_blank\" rel=\"nofollow\">Neve Charity</a> | Powered by <a href=\"http://wordpress.org\" rel=\"nofollow\">WordPress</a>",
"neve_footer_widget_columns": 2,
"neve_text_color": "#404248",
"neve_generated_style_version": 1544175692,
"__ti_import_menus_location": {
"primary": "main"
}
},
"widgets": {
"blog-sidebar": {
"search-2": {
"title": ""
},
"recent-posts-2": {
"title": "",
"number": 5
},
"recent-comments-2": {
"title": "",
"number": 5
},
"archives-2": {
"title": "",
"count": 0,
"dropdown": 0
},
"categories-2": {
"title": "",
"count": 0,
"hierarchical": 0,
"dropdown": 0
},
"meta-2": {
"title": ""
}
},
"footer-one-widgets": {
"nav_menu-2": {
"nav_menu": 2
}
},
"footer-two-widgets": {
"socials-ignited-2": {
"title": "",
"color": "",
"background_color": "",
"size": 18,
"background_size": 30,
"border_radius": 50,
"border_color": "",
"border_width": 0,
"opacity": 1,
"new_win": "",
"nofollow": "",
"icons": [
{
"icon": "fa-facebook",
"url": "#",
"title": ""
},
{
"icon": "fa-twitter",
"url": "#",
"title": ""
},
{
"icon": "fa-instagram",
"url": "#",
"title": ""
}
]
}
}
},
"recommended_plugins": {
"socials-ignited": "Socials Ignited",
"themeisle-companion": "Orbit Fox by ThemeIsle"
},
"mandatory_plugins": {
"elementor": "Elementor Page Builder"
},
"front_page": {
"front_page": "neve-charity-demo-home",
"blog_page": "neve-charity-demo-blog"
},
"shop_pages": null
}
1,351 changes: 651 additions & 700 deletions onboarding/neve-charity/export.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion onboarding/neve-doctors/data.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"theme_mods":{"zelle_frontpage_was_imported":"not-zerif","custom_css_post_id":21,"neve_top_bar_enable":true,"neve_top_bar_content":"Treating you is our passion","background_color":"ffffff","neve_link_color":"#404248","neve_link_hover_color":"#404248","neve_text_color":"#404248","neve_menu_item_color":"#23a455","neve_menu_item_hover_color":"#404248","neve_button_color":"#23a455","neve_footer_content_type":"footer_menu","neve_last_menu_item":"none","neve_generated_style_version":1544043377,"__ti_import_menus_location":{"top-bar":"very-top","primary":"main","footer":"main"}},"widgets":{"blog-sidebar":{"search-2":{"title":""},"recent-posts-2":{"title":"","number":5},"recent-comments-2":{"title":"","number":5},"archives-2":{"title":"","count":0,"dropdown":0},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-2":{"title":""}}},"recommended_plugins":{"elementor":"Elementor Page Builder","themeisle-companion":"Orbit Fox by ThemeIsle"},"front_page":{"front_page":"neve-doctors-demo-home","blog_page":"neve-doctors-demo-blog"},"shop_pages":null}
{"theme_mods":{"zelle_frontpage_was_imported":"not-zerif","custom_css_post_id":21,"neve_top_bar_enable":true,"neve_top_bar_content":"Treating you is our passion","background_color":"ffffff","neve_link_color":"#404248","neve_link_hover_color":"#404248","neve_text_color":"#404248","neve_menu_item_color":"#23a455","neve_menu_item_hover_color":"#404248","neve_button_color":"#23a455","neve_footer_content_type":"footer_menu","neve_last_menu_item":"none","neve_generated_style_version":1544043377,"__ti_import_menus_location":{"top-bar":"very-top","primary":"main","footer":"main"}},"widgets":{"blog-sidebar":{"search-2":{"title":""},"recent-posts-2":{"title":"","number":5},"recent-comments-2":{"title":"","number":5},"archives-2":{"title":"","count":0,"dropdown":0},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-2":{"title":""}}},"recommended_plugins":{"themeisle-companion":"Orbit Fox by ThemeIsle"},"mandatory_plugins":{"elementor":"Elementor Page Builder"},"front_page":{"front_page":"neve-doctors-demo-home","blog_page":"neve-doctors-demo-blog"},"shop_pages":null}
Loading

0 comments on commit 4d5f5d9

Please sign in to comment.