Merge branch 'master' into flexslider-touch-control

fixed-style.css

@@ -4,7 +4,7 @@ Theme URI: http://themes.fruitfulcode.com/fruitful
 Author: fruitfulcode
 Author URI: http://fruitfulcode.com
 Description: Fruitful - Free WordPress responsive theme with powerful theme options panel and simple clean front end design. Ability to modify styles and options according to your needs. Two different layout types responsive and fixed. Easily upload logo, background, edit colors, header and menu positions, slider, fonts, social icons, footer, custom css and much more. Translated to Russian, German, Spanish, French, Vietnamese, RTL ready. Works perfect with WooCommerce, BuddyPress, WPML, Contact form 7.
-Version: 2.6
+Version: 2.7
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: white, orange, light, theme-options, responsive-layout, fixed-layout, custom-header, custom-background, custom-menu, custom-colors, custom-background, translation-ready, featured-images, full-width-template, one-column, right-sidebar, left-sidebar, editor-style

inc/theme-options/theme-options.php

@@ -46,28 +46,28 @@ function fruitful_theme_options_init() {
 	add_settings_field( 'general_cm',		__( 'Comments', 'fruitful' ), 	'fruitful_get_general_comment',  	'theme_options',  'general', array('info' => __( 'If you want to display comments on your post page or page, select options below.', 'fruitful' )));
 	add_settings_field( 'general_ds',		__( 'Default theme styles',  'fruitful' ),'fruitful_get_style_theme', 'theme_options',  'general', array('info' => __( 'Default CSS. Theme option for styling is not working, if this option enable.', 'fruitful' )));
 	add_settings_field( 'general_lp',		__( 'Front page template with latest posts',    'fruitful' ),'fruitful_latest_posts_template','theme_options',  'general', array('info' => __( 'Settings > Reading > Front page displays > Your latest posts', 'fruitful' )));
-	add_settings_field( 'general_cp',		__( 'Custom wordpress pages layout',   'fruitful' ),   'fruitful_custom_pages_layout','theme_options',  'general',   array('info' => __( 'Set default template for pages.', 'fruitful' )));
+	add_settings_field( 'general_cp',		__( 'Page templates by default',   'fruitful' ),   'fruitful_custom_pages_layout','theme_options',  'general',   array('info' => __( 'Choose default display for templates.', 'fruitful' )));
 	add_settings_field( 'general_sf',		__( 'Show Featured image on single post', 'fruitful' ),'fruitful_show_featured_single_post','theme_options',  'general', array('info' => __( 'Select option below for show featured image on single post page.', 'fruitful' )));
 	if(function_exists('icl_get_languages')){ // if WPML is activated
 		add_settings_field( 'general_wpml',		__( 'Multilingual Switch in Header (WPML)', 'fruitful' ), 'fruitful_wpml_ready',  'theme_options',  'general', array('info' => __( 'If you wish to show Language Switch in header, select option below. ', 'fruitful' )));
 	}
 	add_settings_field( 'general_rb',		__( 'Reset options', 'fruitful' ), 'fruitful_reset_btn',  'theme_options',  'general', array('info' => __( 'All theme options will be reset to default. ', 'fruitful' )));
 
 	add_settings_field( 'header_hd',		__( 'Sticky  header', 	 		 'fruitful' ), 	'fruitful_get_general_header', 	'theme_options',  'header', array('info' => __( 'Options relating to the website header', 'fruitful' )));
+	add_settings_field( 'header_mp',		__( 'Menu Position', 			 'fruitful' ), 	'fruitful_set_menu_position', 	'theme_options',  'header', array('info' => __( 'Set menu position.', 'fruitful' )));
+	add_settings_field( 'header_rt',		__( 'Type of Responsive menu', 	 'fruitful' ), 	'fruitful_get_menu_type_resp', 	'theme_options',  'header', array('info' => __( 'Set type of responsive menu.', 'fruitful' )));
 	add_settings_field( 'header_hi',		__( 'Background for header', 	 'fruitful' ), 	'fruitful_get_header_img', 		'theme_options',  'header', array('info' => __( 'Upload image with full width for background in header area. (Supported files .png, .jpg, .gif)  ', 'fruitful' )));
 	add_settings_field( 'header_hs',		__( 'Background image size', 	 'fruitful' ), 	'fruitful_get_header_img_size', 'theme_options',  'header', array('info' => __( 'Choose size for background image - full width or only for content area.', 'fruitful' )));
 	add_settings_field( 'header_hh',		__( 'Height for header area', 	 'fruitful' ), 	'fruitful_get_header_height', 	'theme_options',  'header', array('info' => __( 'Minimum height in pixels', 'fruitful' )));
-	add_settings_field( 'header_mp',		__( 'Menu Position', 			 'fruitful' ), 	'fruitful_set_menu_position', 	'theme_options',  'header', array('info' => __( 'Set menu position.', 'fruitful' )));
-	add_settings_field( 'header_rt',		__( 'Type of Responsive menu', 	 'fruitful' ), 	'fruitful_get_menu_type_resp', 	'theme_options',  'header', array('info' => __( 'Set type of responsive menu.', 'fruitful' )));
 
 	add_settings_field( 'background_image', __( 'Background Image', 'fruitful' ),  'fruitful_get_background_img',   'theme_options',  'background', array('info' => __( 'Upload your background image for site background. (Supported files .png, .jpg, .gif)', 'fruitful' )));
 	add_settings_field( 'background_color', __( 'Background Color ', 'fruitful' ), 'fruitful_get_background_color', 'theme_options',  'background', array('info' => __( 'Choose color for body background', 'fruitful' )));
 	add_settings_field( 'content_background_color', __( 'Background color for content  ', 'fruitful' ), 'fruitful_get_container_background_color', 'theme_options',  'background', array('info' => __( 'Choose color for main content area', 'fruitful' )));
 
 	add_settings_field( 'logo_position', 	__( 'Logo Position', 'fruitful' ), 	'fruitful_set_logo_position', 	'theme_options', 'logo',  	array('info' => __( 'Set Logo Position', 'fruitful' )));
-	add_settings_field( 'logo_size', 			__( 'Logo size', 'fruitful' ), 			'fruitful_get_logo_wh',	 				'theme_options', 'logo',  	array('info' => __( 'Specify resolution for your logo image in pixels. Our theme will crop (timthumb) your image for need size.', 'fruitful' )) );
+	add_settings_field( 'logo_size', 			__( 'Logo size', 'fruitful' ), 			'fruitful_get_logo_wh',	 				'theme_options', 'logo',  	array('info' => __( 'Specify resolution for your logo image', 'fruitful' )) );
 	add_settings_field( 'logo_image', 			__( 'Logo image', 'fruitful' ), 		'fruitful_get_logo_img', 				'theme_options', 'logo',  	array('info' => __( 'Upload logo image for your website. Size is original (Supported files .png, .jpg, .gif)', 'fruitful' )));
-	add_settings_field( 'logo_image_retina',	__( 'Logo image retina', 'fruitful' ), 	'fruitful_get_logo_img_retina', 		'theme_options', 'logo',  	array('info' => __( 'Upload your Retina Logo. This should be your Logo in double size (If your logo is 100 x 20px, it should be 200 x 40px)', 'fruitful' )));
+	add_settings_field( 'logo_image_retina',	__( 'Logo image retina', 'fruitful' ), 	'fruitful_get_logo_img_retina', 		'theme_options', 'logo',  	array('info' => __( 'Upload logo in double size (If your logo is 100 x 20px, it should be 200 x 40px)', 'fruitful' )));
 
 	add_settings_field( 'fav_icon', 				__( 'Favicon', 'fruitful' ), 				'fruitful_get_fav_icon', 				'theme_options', 'logo',  	array('info' => __( 'A favicon is a 16x16 pixel icon that represents your site; upload your custom Favicon here.', 'fruitful' )));
 	add_settings_field( 'fav_icon_iphone',			__( 'Favicon iPhone', 'fruitful' ), 		'fruitful_get_fav_icon_iphone',			'theme_options', 'logo',  	array('info' => __( 'Upload a custom favicon for iPhone (57x57 pixel png).', 'fruitful' )));

languages/ru_RU.po

@@ -2,21 +2,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Fruitful theme\n"
 "POT-Creation-Date: 2014-07-14 16:43+0200\n"
-"PO-Revision-Date: 2014-12-30 14:00+0200\n"
+"PO-Revision-Date: 2015-08-05 10:48+0200\n"
 "Last-Translator: \n"
-"Language-Team: Fruitful Team <fruitfulcode.com>\n"
+"Language-Team: Fruitfulcode <mail@fruitfulcode.com>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.7.1\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop;_e;__;_n;esc_attr_e\n"
-"X-Poedit-Basepath: \\wamp\\www\\fruitful-woocommerce-ru\\wp-content\\themes"
-"\\fruitful\n"
-"Plural-Forms: nplurals=3; plural=((((n%10)==1)&&((n%100)!=11))?(0):(((((n"
-"%10)>=2)&&((n%10)<=4))&&(((n%100)<10)||((n%100)>=20)))?(1):2));\\n;\n"
-"X-Poedit-SearchPath-0: \\wamp\\www\\fruitful-woocommerce-ru\\wp-content"
-"\\themes\\fruitful\n"
+"X-Poedit-Basepath: /Users/ilyapavlov/Work/local/anaglyph-shop/wp-content/"
+"themes/fruitful/languages\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: fruitful/404.php:17
 msgid "Oops! That page can&rsquo;t be found."
@@ -158,7 +156,7 @@ msgstr "Сайдбар Продукта"
 
 #: fruitful/functions.php:454
 msgid "Please add images for slider in theme options!"
-msgstr ""
+msgstr "Пожалуйста добавьте изображения в опциях темы"
 
 #: fruitful/functions.php:933
 msgid "You may be interested in&hellip;"
@@ -834,7 +832,7 @@ msgstr "Скрыть это сообщение"
 
 #: fruitful/inc/func/plugin-activation.php:1088
 msgid "External Link"
-msgstr ""
+msgstr "Внешняя ссылка"
 
 #: fruitful/inc/func/plugin-activation.php:1093
 msgid "Private Repository"
@@ -1026,19 +1024,19 @@ msgstr "Отображение слайдера"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:44
 msgid "Select the option to display the corresponding slider"
-msgstr ""
+msgstr "Выберите опции что бы отобразить слайдер"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:47
 msgid "Disable slider"
-msgstr ""
+msgstr "Отключить слайдер"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:48
 msgid "Full width slider"
 msgstr "На всю ширину"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:49
 msgid "Boxed slider"
-msgstr ""
+msgstr "Слайдер по центру"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:59
 msgid "Page settings"
@@ -1052,35 +1050,35 @@ msgstr "Макет"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:67
 msgid "Select a specific layout for this page."
-msgstr ""
+msgstr "Выберите вариант отображения на этой странице "
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:78
 msgid "Post settings"
-msgstr ""
+msgstr "Настройки для записей"
 
 #: fruitful/inc/metaboxes/init-for-objestcs-mb.php:86
 msgid "Select a specific layout for this post."
-msgstr ""
+msgstr "Выберите отображение для этой записи"
 
 #: fruitful/inc/metaboxes/init.php:258
 msgid "Clear"
-msgstr ""
+msgstr "Очистить"
 
 #: fruitful/inc/metaboxes/init.php:259
 msgid "Default"
 msgstr "По умолчанию"
 
 #: fruitful/inc/metaboxes/init.php:260
 msgid "Select Color"
-msgstr ""
+msgstr "Выберите цвет"
 
 #: fruitful/inc/metaboxes/init.php:261
 msgid "Current Color"
 msgstr "Текущий цвет"
 
 #: fruitful/inc/metaboxes/init.php:293
 msgid "Select / Deselect All"
-msgstr ""
+msgstr "Выбрать / Убрать все"
 
 #: fruitful/inc/metaboxes/init.php:1187
 #: fruitful/inc/theme-options/theme-options.php:782
@@ -1090,7 +1088,7 @@ msgstr "Сохранить"
 
 #: fruitful/inc/metaboxes/helpers/cmb_Meta_Box_ajax.php:47
 msgid "Please Try Again"
-msgstr ""
+msgstr "Попробуйте еще раз"
 
 #: fruitful/inc/metaboxes/helpers/cmb_Meta_Box_ajax.php:131
 msgid "Remove Embed"
@@ -1182,7 +1180,7 @@ msgstr "Если в настройка > Чтение > Главная стра
 
 #: fruitful/inc/theme-options/theme-options.php:50
 msgid "Multilingual Switch in Header (WPML)"
-msgstr ""
+msgstr "Переключатель языка в шапке сайта (WPML)"
 
 #: fruitful/inc/theme-options/theme-options.php:50
 msgid "If you wish to show Language Switch in header, select option below. "

readme.txt

@@ -103,6 +103,17 @@ Files: .pot, ru_Ru.po, ru_Ru.mo icluded. Default language is english.
     Changelog
 -------------------------------------------------------
 
+= 2.7 =
+05.08.2015
+
+* New: WooCoomerce product sidebar options
+* Update: WooCommerce 2.3.13 ready
+* Update: FlexSlider.js 2.5.0
+* Update: ru_Ru translations
+* Bug fix: Retina logo
+* Bug fix: Social media icons
+
+
 = 2.6 =
 21.05.15
 

style.css

@@ -4,7 +4,7 @@ Theme URI: http://themes.fruitfulcode.com/fruitful
 Author: fruitfulcode
 Author URI: http://fruitfulcode.com
 Description: Fruitful - Free WordPress responsive theme with powerful theme options panel and simple clean front end design. Ability to modify styles and options according to your needs. Two different layout types responsive and fixed. Easily upload logo, background, edit colors, header and menu positions, slider, fonts, social icons, footer, custom css and much more. Translated to Russian, German, Spanish, French, Vietnamese, RTL ready. Works perfect with WooCommerce, BuddyPress, WPML, Contact form 7.
-Version: 2.6
+Version: 2.7
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: white, orange, light, theme-options, responsive-layout, fixed-layout, custom-header, custom-background, custom-menu, custom-colors, custom-background, translation-ready, featured-images, full-width-template, one-column, right-sidebar, left-sidebar, editor-style
@@ -1408,7 +1408,7 @@ article.format-image .wp-caption a:hover:after{
 }
 /* .entry-content iframe{max-height:650px} */
 
-.header-hgroup a.link-logo-retina {
+.header-hgroup a.link-logo-retina, .site-header a.link-logo-retina {
 	display:none;
 }