Merge branch 'master' into develop

build.sh

@@ -6,24 +6,24 @@ command -v sass >/dev/null 2>&1 || {
 
 source build-config.cfg
 
+echo "Updating files of theme"
+rm -rf $destination
+mkdir $destination
+
+##Removendo o arquivo sass
+##rm -rf $destination/scss
+
 ## Install composer dependencies
 composer install
 
 ## Compile SASS
 sh compile-sass.sh
 
-echo "Updating files of theme"
-rm -rf $destination
-mkdir $destination
 cp -R src/* $destination/
 
-##Removendo o arquivo sass
-rm -rf $destination/scss
-
 ##Bootstrap
 mkdir $destination/assets/vendor/bootstrap/css
 cp $destination/assets/vendor/bootstrap/scss/bootstrap.min.css $destination/assets/vendor/bootstrap/css/bootstrap.min.css
-rm -rf $destination/assets/vendor/bootstrap/scss
 rm -rf $destination/vendor
 
 ##Slick
@@ -32,6 +32,9 @@ cp $destination/assets/vendor/slick/scss/slick.min.css $destination/assets/vendo
 cp $destination/assets/vendor/slick/scss/slick-theme.min.css $destination/assets/vendor/slick/css/slick-theme.min.css
 mv $destination/assets/vendor/slick/ajax-loader.gif $destination/assets/vendor/slick/css/ajax-loader.gif
 mv $destination/assets/vendor/slick/fonts/ $destination/assets/vendor/slick/css/fonts/
-rm -rf $destination/assets/vendor/slick/scss
+
+##clean 
+rm $destination/assets/vendor/ekko-lightbox/.gitignore
+rm -rf $destination/assets/vendor/ekko-lightbox/.git
 
 echo "Compilation Finish!!"

compile-sass.sh

@@ -18,7 +18,7 @@ echo "Compiling Sass..."
 #Style do Tema
 #cd ../../../../assets/scss
 cd src/assets/scss
-sass -E 'UTF-8' style.scss:../../style.css --style compressed
+sass -E 'UTF-8' style.scss:../../style.css
 echo "Style of Tainacan Compiled";
 sass bootstrap_custom.scss:../vendor/bootstrap/scss/bootstrap.min.css --style compressed
 echo "Bootstrap Compiled";

install.sh

@@ -25,18 +25,13 @@ echo "Copy Slick for Slider...\n\n";
         mkdir("src/assets/vendor/slick/js", 0777, true);
         mkdir("src/assets/vendor/slick/fonts", 0777, true);
     }
-    copy("vendor/fabianobn/slick/slick/slick-theme.scss", "src/assets/vendor/slick/scss/slick-theme.scss");
+    recurse_copy("vendor/fabianobn/slick/slick/", "src/assets/vendor/slick/");
-    copy("vendor/fabianobn/slick/slick/slick.scss", "src/assets/vendor/slick/scss/slick.scss");
-    copy("vendor/fabianobn/slick/slick/slick.min.js", "src/assets/vendor/slick/js/slick.min.js");
-    copy("vendor/fabianobn/slick/slick/ajax-loader.gif", "src/assets/vendor/slick/ajax-loader.gif");
-    recurse_copy("vendor/fabianobn/slick/slick/fonts", "src/assets/vendor/slick/fonts");
     
 echo "Copy Ekko Lightbox...\n\n";
     if (!file_exists("src/assets/vendor/ekko-lightbox")) {
         mkdir("src/assets/vendor/ekko-lightbox/", 0777, true);
     }
-    copy("vendor/fabianobn/ekko-lightbox/dist/ekko-lightbox.min.js", "src/assets/vendor/ekko-lightbox/ekko-lightbox.min.js");
+    recurse_copy("vendor/fabianobn/ekko-lightbox/", "src/assets/vendor/ekko-lightbox/");
-    copy("vendor/fabianobn/ekko-lightbox/dist/ekko-lightbox.css", "src/assets/vendor/ekko-lightbox/ekko-lightbox.min.css");
 
 echo "Finish Copy files! \n\n";
 

src/404.php

@@ -1,6 +1,6 @@
 <?php get_header();?>
 
-	<div class="page-header page-404 header-filter clear-filter" style="background-image: url('<?php echo get_template_directory_uri(); ?>/assets/images/404.png')">
+	<div class="page-header page-404 header-filter clear-filter" style="background-image: url('<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/404.png')">
 		<div class="container align-self-center">
 			<div class="row">
 				<div class="col-md-12 mx-auto">
@@ -10,7 +10,7 @@
 					</div>
 				</div>
 				<div class="col-md-12 mx-auto text-center">
-					<a href="<?php echo home_url(); ?>" class="btn btn-primary bg-jungle-green py-0"><?php _e( 'Go to the first page', 'tainacan-interface' );?></a>
+					<a href="<?php echo esc_url( home_url() ); ?>" class="btn btn-primary bg-jungle-green py-0"><?php _e( 'Go to the first page', 'tainacan-interface' );?></a>
 				</div>
 			</div>
 		</div>

src/README.txt

@@ -1,8 +1,10 @@
 === Tainacan Interface ===
 Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto
 Requires at least: WordPress 4.8
-Tested up to: WordPress 5.0.3
+Tested up to: WordPress 5.1
-Version: 1.0.9
+Version: 1.0.11
+Requires PHP: 5.6
+Stable tag: trunk
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: two-columns, right-sidebar, grid-layout, flexible-header, custom-colors, custom-header, custom-menu, custom-logo, featured-images, footer-widgets, theme-options, threaded-comments, translation-ready, photography, portfolio 
@@ -58,14 +60,18 @@ Licenses: GPLv3+
 Source: https://github.com/wp-bootstrap/wp-bootstrap-navwalker
 
 Photos used in the screenshot
-Kingfisher birds
+
-1. https://pixabay.com/en/kingfisher-bird-alcedo-atthis-1068684/
+1. https://pxhere.com/en/photo/73320
-License: CC0
-2. https://pixabay.com/en/animal-background-beak-beautiful-3387479/
-License CC0
-3. https://pixabay.com/en/animal-avian-beak-bird-1867936/
 License: CC0
 
+2. https://pxhere.com/en/photo/73383
+License CC0
+
+3. https://pxhere.com/en/photo/73485
+License: CC0
+
+4. https://pxhere.com/en/photo/1432253
+License: CC0
 
 Bundled images, Copyright Taincan.org
 License: CC0 1.0 Universal (CC0 1.0)

src/assets/scss/style.scss

@@ -3,7 +3,7 @@ Theme Name: Tainacan Interface
 Author: MediaLab UFG
 Author URI: https://tainacan.org
 Description: This is the default theme for the Tainacan project. Use this in conjunction with Tainacan plugin to easily manage and publish you digital collectinons with a beautiful faceted search interface. Ideal for museums, galleries, libraries and anyone who have a digital repository. 
-Version: 1.0.9
+Version: 1.0.11
 License: GNU General Public License v3
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
 Tags: two-columns, right-sidebar, grid-layout, flexible-header, custom-colors, custom-header, custom-menu, custom-logo, featured-images, footer-widgets, theme-options, threaded-comments, translation-ready, photography, portfolio 

src/footer.php

@@ -19,34 +19,34 @@
 					} else {
 						echo '</p><p>';
 					}
-					if ( get_option( 'tainacan_blogaddress' ) ) {
+					if ( get_theme_mod( 'tainacan_blogaddress' ) ) {
-						echo wp_filter_nohtml_kses( get_option( 'tainacan_blogaddress', '' ) );
+						echo wp_filter_nohtml_kses( get_theme_mod( 'tainacan_blogaddress', '' ) );
 					} ?>
 				</p>
 				<p class="tainacan-footer-info--blog">
-<?php if ( get_option( 'tainacan_blogemail' ) ) {
+<?php if ( get_theme_mod( 'tainacan_blogemail' ) ) {
-	printf( __( 'E-mail: %s', 'tainacan-interface' ), sanitize_email( get_option( 'tainacan_blogemail', '' ) ) );
+	printf( __( 'E-mail: %s', 'tainacan-interface' ), sanitize_email( get_theme_mod( 'tainacan_blogemail', '' ) ) );
 }
-if ( get_option( 'tainacan_blogemail' ) && get_option( 'tainacan_blogphone' ) ) {
+if ( get_theme_mod( 'tainacan_blogemail' ) && get_theme_mod( 'tainacan_blogphone' ) ) {
 	if ( wp_is_mobile() ) :
 		echo '<br>';
 	else :
 		echo ' - ';
 	endif;
 }
-if ( get_option( 'tainacan_blogphone' ) ) {
+if ( get_theme_mod( 'tainacan_blogphone' ) ) {
-	printf( __( 'Telephone: %s', 'tainacan-interface' ), wp_filter_nohtml_kses( get_option( 'tainacan_blogphone', '' ) ) );
+	printf( __( 'Telephone: %s', 'tainacan-interface' ), wp_filter_nohtml_kses( get_theme_mod( 'tainacan_blogphone', '' ) ) );
 } ?>
 				</p>
 			</div>
 			<div class="col-auto pr-0 pr-md-3 d-none d-md-block align-self-md-top">
-					<img src="<?php if ( get_theme_mod( 'tainacan_footer_logo' ) ) { echo esc_attr( get_theme_mod( 'tainacan_footer_logo' ) ); }else{ echo get_template_directory_uri() ?>/assets/images/logo-footer.svg<?php }?> ?>" class="tainacan-footer-info--logo" >
+					<img src="<?php if ( get_theme_mod( 'tainacan_footer_logo' ) ) { echo esc_attr( get_theme_mod( 'tainacan_footer_logo' ) ); }else{ echo esc_url( get_template_directory_uri() ); ?>/assets/images/logo-footer.svg<?php }?> ?>" class="tainacan-footer-info--logo" >
 			</div>
 			<div class="col-12 tainacan-powered">
 				<span>
 					<?php if ( true == get_theme_mod( 'tainacan_display_powered', false ) ) {
 						/* translators: 1: WordPress; 2: Tainacan*/
-						printf( __( 'Proudly powered by %1$s and %2$s.', 'tainacan-interface' ), '<a href="https://wordpress.org/">Wordpress</a>', '<a href="http://tainacan.org/">Tainacan</a>' ); } ?>
+						printf( __( 'Proudly powered by %1$s and %2$s.', 'tainacan-interface' ), '<a href="https://wordpress.org/">WordPress</a>', '<a href="http://tainacan.org/">Tainacan</a>' ); } ?>
 				</span>
 			</div>
 		</div>

src/functions.php

@@ -26,7 +26,6 @@ if ( ! function_exists( 'tainacan_setup' ) ) {
 		 * Custom header to change the banner image
 		 */
 		$header_args = array(
-			//'default-text-color' => '000',
 			'width'              => 2000,
 			'height'             => 280,
 			'header-text'		 => false,
@@ -43,15 +42,6 @@ if ( ! function_exists( 'tainacan_setup' ) ) {
 		 */
 		add_theme_support( 'title-tag' );
 
-		/* register_default_headers(
-			array(
-				'default-image' => array(
-					'url'           => '%s/assets/images/capa.png',
-					'thumbnail_url' => '%s/assets/images/capa.png',
-					'description'   => __( 'Default Image', 'tainacan-interface' ),
-				),
-			)
-		); */
 		require_once get_template_directory() . '/functions/enqueues.php' ;
 
 		/**
@@ -67,8 +57,8 @@ if ( ! function_exists( 'tainacan_setup' ) ) {
 
 		if ( function_exists( 'tainacan_register_view_mode' ) ) {
 			tainacan_register_view_mode('grid', array(
-				'label' => 'Thumbnail',
+				'label' => __( 'Thumbnail', 'tainacan-interface' ),
-				'description' => 'A thumbnail grid view, showing only title and thumbnail',
+				'description' => __( 'A thumbnail grid view, showing only title and thumbnail', 'tainacan-interface' ),
 				'icon' => '<span class="icon"><i class="mdi mdi-apps mdi-24px"></i></span>',
 				'dynamic_metadata' => false,
 				'template' => get_template_directory() . '/tainacan/view-mode-grid.php',

src/functions/breadcrumb.php

@@ -13,7 +13,7 @@ function tainacan_interface_the_breadcrumb() {
 	$after = '</span>'; // tag after the current crumb
 
 	global $post;
-	$homeLink = home_url();
+	$homeLink = esc_url( home_url() );
 
 	if (is_home() || is_front_page()) {
 

src/functions/class-tainacanthemecollectioncolor.php

@@ -18,8 +18,8 @@ class TainacanThemeCollectionColor {
 	}
 
 	function action_tainacan_enqueue_admin_scripts() {
-		wp_enqueue_script( 'tainacan_colorWell', get_template_directory_uri() . '/functions/collection-color.js', false, false, true );
+		wp_enqueue_script( 'tainacan_colorWell', get_template_directory_uri() . '/assets/js/collection-color.js', false, false, true );
-		wp_enqueue_style( 'tainacan_colorWellStyle', get_template_directory_uri() . '/functions/collection-color.css' );
+		wp_enqueue_style( 'tainacan_colorWellStyle', get_template_directory_uri() . '/assets/css/collection-color.css' );
 		wp_localize_script( 'tainacan_colorWell', 'tainacan_colorPickerVars', array(
 			'cancelText' => __( 'Cancel', 'tainacan-interface' ),
 			'chooseText' => __( 'Choose', 'tainacan-interface' ),
@@ -29,8 +29,8 @@ class TainacanThemeCollectionColor {
 			'noColorSelectedText' => __( 'No Color Selected', 'tainacan-interface' ),
 		));
 
-		wp_enqueue_script( 'tainacan_Spectrum', get_template_directory_uri() . '/assets/js/spectrum.js', false, false, true );
+		wp_enqueue_script( 'spectrum', get_template_directory_uri() . '/assets/js/spectrum.js', false, false, true );
-		wp_enqueue_style( 'tainacan_Spectrum', get_template_directory_uri() . '/assets/js/spectrum.css' );
+		wp_enqueue_style( 'spectrum', get_template_directory_uri() . '/assets/css/spectrum.css' );
 	}
 
 	function register_hook() {

src/functions/customizer.php

@@ -21,33 +21,36 @@ function tainacan_customize_register( $wp_customize ) {
 		'priority'   => 200,
 	));
 	$wp_customize->add_setting( 'tainacan_blogaddress', array(
-		'type'       => 'option',
+		'type'       => 'theme_mod',
 		'capability' => 'manage_options',
 		'sanitize_callback'  => 'sanitize_text_field',
 	) );
 
 	$wp_customize->add_control( 'tainacan_blogaddress', array(
+		'type'       => 'theme_mod',
 		'label'      => __( 'Address', 'tainacan-interface' ),
 		'section'    => 'tainacan_footer_info',
 	) );
 	$wp_customize->add_setting( 'tainacan_blogphone', array(
-		'type'       => 'option',
+		'type'       => 'theme_mod',
 		'capability' => 'manage_options',
 		'sanitize_callback'  => 'tainacan_sanitize_phone',
 	) );
 
 	$wp_customize->add_control( 'tainacan_blogphone', array(
+		'type'       => 'theme_mod',
 		'label'      => __( 'Phone Number', 'tainacan-interface' ),
 		'section'    => 'tainacan_footer_info',
 	) );
 
 	$wp_customize->add_setting( 'tainacan_blogemail', array(
-		'type'       => 'option',
+		'type'       => 'theme_mod',
 		'capability' => 'manage_options',
 		'sanitize_callback'  => 'tainacan_sanitize_email',
 	) );
 
 	$wp_customize->add_control( 'tainacan_blogemail', array(
+		'type'       => 'theme_mod',
 		'label'      => __( 'E-mail', 'tainacan-interface' ),
 		'section'    => 'tainacan_footer_info',
 	) );
@@ -56,6 +59,7 @@ function tainacan_customize_register( $wp_customize ) {
 	 * Footer Logo customizer
 	 */
 	$wp_customize->add_setting( 'tainacan_footer_logo', array(
+		'type'       => 'theme_mod',
 		'capability' => 'manage_options',
 		'sanitize_callback' => 'tainacan_sanitize_upload',
 	) );
@@ -74,6 +78,7 @@ function tainacan_customize_register( $wp_customize ) {
 	 * Checkbox to display or no the Proudly Powered by Wordpress and Tainacan.
 	 */
 	$wp_customize->add_setting( 'tainacan_display_powered', array(
+		'type'       => 'theme_mod',
 		'default'        => true,
 		'capability' => 'edit_theme_options',
 		'sanitize_callback' => 'tainacan_display_callback_sanitize_checkbox',
@@ -98,6 +103,7 @@ function tainacan_customize_register( $wp_customize ) {
 
 	//Facebook
 	$wp_customize->add_setting( 'tainacan_facebook_share', array(
+		'type'       => 'theme_mod',
 		'default'        => true,
 		'capability' => 'edit_theme_options',
 		'sanitize_callback' => 'tainacan_display_callback_sanitize_checkbox',
@@ -108,11 +114,11 @@ function tainacan_customize_register( $wp_customize ) {
 		'settings' => 'tainacan_facebook_share',
 		'section' => 'tainacan_social_share',
 		'label' => __( 'Display Facebook button', 'tainacan-interface' ),
-		//'description' => __( 'This checkbox display or no the Facebook Share.', 'tainacan-interface' ),
 	) );
 
 	//Twitter
 	$wp_customize->add_setting( 'tainacan_twitter_share', array(
+		'type'       => 'theme_mod',
 		'default'        => true,
 		'capability' => 'edit_theme_options',
 		'sanitize_callback' => 'tainacan_display_callback_sanitize_checkbox',
@@ -123,11 +129,10 @@ function tainacan_customize_register( $wp_customize ) {
 		'settings' => 'tainacan_twitter_share',
 		'section' => 'tainacan_social_share',
 		'label' => __( 'Display Twitter button', 'tainacan-interface' ),
-		//'description' => __( 'This checkbox display or no the Twitter Share.', 'tainacan-interface' ),
 	) );
 
 	$wp_customize->add_setting( 'tainacan_twitter_user', array(
-		'type'       => 'option',
+		'type'       => 'theme_mod',
 		'capability' => 'manage_options',
 		'sanitize_callback'  => 'sanitize_text_field',
 	) );
@@ -139,6 +144,7 @@ function tainacan_customize_register( $wp_customize ) {
 
 	//Google Plus
 	$wp_customize->add_setting( 'tainacan_google_share', array(
+		'type'       => 'theme_mod',
 		'default'        => true,
 		'capability' => 'edit_theme_options',
 		'sanitize_callback' => 'tainacan_display_callback_sanitize_checkbox',
@@ -149,13 +155,13 @@ function tainacan_customize_register( $wp_customize ) {
 		'settings' => 'tainacan_google_share',
 		'section' => 'tainacan_social_share',
 		'label' => __( 'Display Google Plus button', 'tainacan-interface' ),
-		//'description' => __( 'This checkbox display or no the Google Plus Share.', 'tainacan-interface' ),
 	) );
 
 	/**
 	 * Add color scheme setting and control.
 	 */
 	$wp_customize->add_setting( 'tainacan_color_scheme', array(
+		'type'       => 'theme_mod',
 		'default'           => 'default',
 		'sanitize_callback' => 'tainacan_sanitize_color_scheme',
 		'transport'         => 'postMessage',
@@ -178,6 +184,7 @@ function tainacan_customize_register( $wp_customize ) {
 	 * Add link color setting and control.
 	 */
 	$wp_customize->add_setting( 'tainacan_link_color', array(
+		'type'       => 'theme_mod',
 		'default'           => $color_scheme[2],
 		'sanitize_callback' => 'sanitize_hex_color',
 		'transport'         => 'postMessage',
@@ -189,6 +196,7 @@ function tainacan_customize_register( $wp_customize ) {
 	) ) );
 
 	$wp_customize->add_setting( 'tainacan_tooltip_color', array(
+		'type'       => 'theme_mod',
 		'default'           => $color_scheme[3],
 		'sanitize_callback' => 'sanitize_hex_color',
 		'transport'         => 'postMessage',

src/functions/enqueues.php

@@ -12,43 +12,40 @@ if ( ! function_exists( 'tainacan_enqueues' ) ) {
 		 * Bootstrap 4.1.3
 		 */
 			//Style
-			wp_register_style( 'tainacan_bootstrap4CSS', get_template_directory_uri() . '/assets/vendor/bootstrap/css/bootstrap.min.css' );
+			wp_register_style( 'bootstrap4CSS', get_template_directory_uri() . '/assets/vendor/bootstrap/css/bootstrap.min.css' );
-			wp_enqueue_style( 'tainacan_bootstrap4CSS' );
+			wp_enqueue_style( 'bootstrap4CSS' );
-			/* //Popper
-			wp_register_script( 'tainacan_popper_bootstrap4', get_template_directory_uri() . '/assets/vendor/bootstrap/js/popper.min.js', '', '', true );
-			wp_enqueue_script( 'tainacan_popper_bootstrap4' ); */
 			//Javascript
-			wp_register_script( 'tainacan_bootstrap4JS', get_template_directory_uri() . '/assets/vendor/bootstrap/js/bootstrap.min.js', array( 'jquery' ), '', true );
+			wp_register_script( 'bootstrap4JS', get_template_directory_uri() . '/assets/vendor/bootstrap/js/bootstrap.min.js', array( 'jquery' ), '', true );
-			wp_enqueue_script( 'tainacan_bootstrap4JS' );
+			wp_enqueue_script( 'bootstrap4JS' );
 
 		/**
 		 * Slick Slider Carousel
 		 */
 			//Styles
-			wp_register_style( 'tainacan_SlickCss', get_template_directory_uri() . '/assets/vendor/slick/css/slick.min.css', '', '1.6.1', '' );
+			wp_register_style( 'SlickCss', get_template_directory_uri() . '/assets/vendor/slick/css/slick.min.css', '', '1.6.1', '' );
-			wp_register_style( 'tainacan_SlickThemeCss', get_template_directory_uri() . '/assets/vendor/slick/css/slick-theme.min.css', '', '1.6.1', '' );
+			wp_register_style( 'SlickThemeCss', get_template_directory_uri() . '/assets/vendor/slick/css/slick-theme.min.css', '', '1.6.1', '' );
-			wp_enqueue_style( 'tainacan_SlickCss' );
+			wp_enqueue_style( 'SlickCss' );
-			wp_enqueue_style( 'tainacan_SlickThemeCss' );
+			wp_enqueue_style( 'SlickThemeCss' );
 			//Javascript
-			wp_register_script( 'tainacan_SlickJS', get_template_directory_uri() . '/assets/vendor/slick/js/slick.min.js', array( 'jquery' ), '1.6.1', true );
+			wp_register_script( 'SlickJS', get_template_directory_uri() . '/assets/vendor/slick/js/slick.min.js', array( 'jquery' ), '1.6.1', true );
-			wp_enqueue_script( 'tainacan_SlickJS' );
+			wp_enqueue_script( 'SlickJS' );
 
 		/**
 		 * Ekko Lightbox
 		 */
-			wp_register_style( 'tainacan_EkkoLightboxCss', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/ekko-lightbox.min.css');
+			wp_register_style( 'EkkoLightboxCss', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/ekko-lightbox.min.css');
-			wp_enqueue_style( 'tainacan_EkkoLightboxCss' );
+			wp_enqueue_style( 'EkkoLightboxCss' );
-			wp_register_script( 'tainacan_EkkoLightboxJs', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/ekko-lightbox.min.js', array('jquery'), null, true);
+			wp_register_script( 'EkkoLightboxJs', get_template_directory_uri() . '/assets/vendor/ekko-lightbox/ekko-lightbox.min.js', array('jquery'), null, true);
-			wp_enqueue_script( 'tainacan_EkkoLightboxJs' );
+			wp_enqueue_script( 'EkkoLightboxJs' );
 
 		/**
 		 * Google
 		 */
 			// Google fonts Roboto
-			wp_enqueue_style( 'tainacan_RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i' );
+			wp_enqueue_style( 'RobotoFonts', 'https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i' );
 			// Material Icons
-			wp_register_style( 'tainacan_MaterialIconsFonts', get_template_directory_uri() . '/assets/fonts/material-design-icons/css/materialdesignicons.min.css', '', '2.4.85', '' );
+			wp_register_style( 'MaterialIconsFonts', get_template_directory_uri() . '/assets/fonts/material-design-icons/css/materialdesignicons.min.css', '', '2.4.85', '' );
-			wp_enqueue_style( 'tainacan_MaterialIconsFonts' );
+			wp_enqueue_style( 'MaterialIconsFonts' );
 
 		/**
 		 * Tainacan Theme
@@ -59,7 +56,7 @@ if ( ! function_exists( 'tainacan_enqueues' ) ) {
 				'lessText' => __( 'Show less', 'tainacan-interface' ),
 			));
 
-			wp_register_style( 'tainacan_tainacanStyle', get_stylesheet_uri(), array( 'tainacan_bootstrap4CSS' ) );
+			wp_register_style( 'tainacan_tainacanStyle', get_stylesheet_uri(), array( 'bootstrap4CSS' ) );
 			wp_enqueue_style( 'tainacan_tainacanStyle' );
 			wp_register_script( 'tainacan_tainacanJS', get_template_directory_uri() . '/assets/js/js.js', '', '1.0', true );
 			wp_enqueue_script( 'tainacan_tainacanJS' );

src/functions/single-functions.php

@@ -8,7 +8,6 @@
 function tainacan_comments_callback( $comment, $args, $depth ) {
 	//get comment to determine type
 	global $post;
-	//var_dump($args);die;
 	$class_has = 'has-children media comment-' . $comment->comment_ID; ?>
 	<div <?php comment_class( $args['has_children'] ? $class_has : 'parent media' ); ?> id="comment-<?php comment_ID() ?>">
 		<?php
@@ -70,7 +69,10 @@ if ( ! function_exists( 'tainacan_pagination' ) ) :
 		$to_paged = max( (int) $wp_query->get( 'paged' ), 1 );
 		$count_max = ( $to_paged - 1 ) * $cur_posts; ?>
 		<div class="d-flex margin-pagination justify-content-between border-top pt-2">
-			<?php printf( '<div class="col-sm-3 d-none d-lg-block pl-0 view-items">Viewing Items: %d to %d from %d</div>', $count_max + 1, $count_max + $wp_query->post_count, $wp_query->found_posts ); ?>
+			<div class="col-sm-3 d-none d-lg-block pl-0 view-items">
+				<?php //translators: Example - Viewing Items: 1 to 12 of 345 ?>
+				<?php printf( __('Viewing Items: %1$d to %2$d of %3$d', 'tainacan-interface'), $count_max + 1, $count_max + $wp_query->post_count, $wp_query->found_posts ); ?>
+			</div>
 			<div class="col-sm-5 pr-md-0 justify-content-md-end">
 				<?php the_posts_pagination(
 					array(

src/header.php

@@ -15,7 +15,7 @@
 		<div class="container-fluid max-large px-0 margin-one-column" id="topNavbar">
 			<?php echo tainacan_get_logo(); ?>
 			<div class="btn-group ml-auto"> 
-					<form class="form-horizontal my-2 my-md-0 tainacan-search-form d-none d-md-block" [formGroup]="searchForm" role="form" (keyup.enter)="onSubmit()" action="<?php echo home_url( '/' ); ?>">
+					<form class="form-horizontal my-2 my-md-0 tainacan-search-form d-none d-md-block" [formGroup]="searchForm" role="form" (keyup.enter)="onSubmit()" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 						<div class="input-group">
 							<input type="text" name="s" placeholder="<?php esc_attr_e( 'Search', 'tainacan-interface' ); ?>" class="form-control" formControlName="searchText" size="50">
 							<span class="text-midnight-blue input-group-btn mdi mdi-magnify form-control-feedback"></span>

src/languages/tainacan-interface.pot

@@ -1,20 +1,15 @@
-# WordPress Blank Pot
+# Tainacan Interface
-# Copyright (C) 2014 ...
 # This file is distributed under the GNU General Public License v2 or later.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: "
-"WordPress Blank Pot "
+"Tainacan Interface\n"
-"v1.0.0\n"
 "POT-Creation-Date: "
-"2018-08-03 11:47-0300\n"
+"2019-02-21 17:19-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Your "
 "Name <you@example.com>\n"
-"Language-Team: Your Team "
+"Language-Team: \n"
-"<translations@example."
-"com>\n"
 "Report-Msgid-Bugs-To: "
 "Translator Name "
 "<translations@example."
@@ -47,18 +42,23 @@ msgstr ""
 "X-Poedit-Basepath: ..\n"
 "Language: en_US\n"
 "X-Generator: Poedit "
-"2.0.4\n"
+"2.0.6\n"
 "X-Poedit-"
 "SearchPath-0: .\n"
 
+#: 404.php:8
+msgid "404"
+msgstr ""
+
 #: 404.php:9
 msgid ""
 "The page you are looking "
 "for does not exist!"
 msgstr ""
 
-#: 404.php:14
+#: 404.php:13
-msgid "Go to first page"
+msgid ""
+"Go to the first page"
 msgstr ""
 
 #: archive-tainacan-collection.php:15
@@ -70,7 +70,7 @@ msgid "Creation date"
 msgstr ""
 
 #: archive-tainacan-collection.php:19
-#: template-parts/loop-tainacan-collection-table.php:8
+#: template-parts/loop-tainacan-collection-table.php:7
 msgid "Title"
 msgstr ""
 
@@ -94,280 +94,491 @@ msgstr ""
 msgid "Search collections"
 msgstr ""
 
-#: comments.php:23
+#: comments.php:25
 #, php-format
 msgid ""
-"You must be %slogged%s "
+"You must be %1$slogged"
-"in to post a comment."
+"%2$s in to post a "
+"comment."
 msgstr ""
 
-#: comments.php:27
+#: comments.php:29
 msgid "Leave your comment"
 msgstr ""
 
-#: comments.php:31
+#: comments.php:32
-#: comments.php:42
+msgid "Authenticated as:"
-#: comments.php:61
-msgid "Authenticated as"
 msgstr ""
 
-#: comments.php:46
+#: comments.php:43
-#: comments.php:65
+#, php-format
-msgid "Anonymous"
+msgid ""
+"Authenticated as %1$s"
 msgstr ""
 
-#: comments.php:74
+#: comments.php:54
-msgid "Name"
-msgstr ""
-
-#: comments.php:78
-#: functions/customizer.php:48
-msgid "E-mail"
-msgstr ""
-
-#: comments.php:82
-msgid "Website"
-msgstr ""
-
-#: comments.php:86
-msgid "Comment"
-msgstr ""
-
-#: comments.php:92
-msgid "Cancel"
-msgstr ""
-
-#: comments.php:93
 msgid "Send"
 msgstr ""
 
-#: comments.php:108
+#: comments.php:70
 msgid "Previous Comments"
 msgstr ""
 
-#: comments.php:111
+#: comments.php:73
 msgid "Next Comments"
 msgstr ""
 
-#: comments.php:117
+#: comments.php:79
 msgid ""
 "Comments are closed."
 msgstr ""
 
 #: footer.php:28
-msgid "E-mail: "
+#, php-format
+msgid "E-mail: %s"
 msgstr ""
 
-#: footer.php:35
+#: footer.php:38
-msgid "Telephone: "
+#, php-format
+msgid "Telephone: %s"
 msgstr ""
 
-#: functions.php:85
+#: footer.php:49
+#, php-format
+msgid ""
+"Proudly powered by %1$s "
+"and %2$s."
+msgstr ""
+
+#: functions.php:60
+#: tainacan/single-items.php:113
+msgid "Thumbnail"
+msgstr ""
+
+#: functions.php:61
+msgid ""
+"A thumbnail grid view, "
+"showing only title and "
+"thumbnail"
+msgstr ""
+
+#: functions.php:117
 msgid ""
 "Tainacan Sidebar Right"
 msgstr ""
 
-#: functions.php:100
+#: functions.php:132
 msgid ""
 "Tainacan Sidebar Footer"
 msgstr ""
 
-#: functions.php:141
+#: functions.php:182
-#: searchform.php:3
-msgid "Search"
-msgstr ""
-
-#: functions.php:180
 msgid ""
-"Nav Menu Below Header"
+"Navigation menu below "
+"header"
 msgstr ""
 
-#: functions.php:221
+#: functions.php:227
+#: functions/breadcrumb.php:51
+#: functions/breadcrumb.php:66
 msgid "Collections"
 msgstr ""
 
+#: functions/breadcrumb.php:10
+msgid "Home"
+msgstr ""
+
+#: functions/breadcrumb.php:29
+msgid ""
+"Archive by category \""
+msgstr ""
+
+#: functions/breadcrumb.php:32
+msgid ""
+"Search results for \""
+msgstr ""
+
+#: functions/breadcrumb.php:96
+msgid "Posts tagged \""
+msgstr ""
+
+#: functions/breadcrumb.php:101
+msgid "Articles posted by "
+msgstr ""
+
+#: functions/breadcrumb.php:104
+msgid "Error 404"
+msgstr ""
+
+#: functions/breadcrumb.php:109
+msgid "Page"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:24
+msgid "Cancel"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:25
+msgid "Choose"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:26
+msgid "more"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:27
+msgid "less"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:28
+msgid ""
+"Clear Color Selection"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:29
+msgid "No Color Selected"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:52
+#: functions/class-tainacanthemecollectioncolor.php:61
+msgid ""
+"Collection Background "
+"Color"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:64
+msgid ""
+"Collection header fill "
+"color"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:69
+msgid "Picker color"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:75
+#: functions/class-tainacanthemecollectioncolor.php:84
+msgid ""
+"Collection Text Color"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:87
+msgid ""
+"Text color on collection "
+"header"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:97
+msgid "White"
+msgstr ""
+
+#: functions/class-tainacanthemecollectioncolor.php:103
+msgid "Black"
+msgstr ""
+
 #: functions/customizer.php:20
 msgid "Footer settings"
 msgstr ""
 
-#: functions/customizer.php:29
+#: functions/customizer.php:30
 msgid "Address"
 msgstr ""
 
-#: functions/customizer.php:38
+#: functions/customizer.php:40
 msgid "Phone Number"
 msgstr ""
 
-#: functions/customizer.php:62
+#: functions/customizer.php:51
+msgid "E-mail"
+msgstr ""
+
+#: functions/customizer.php:66
 msgid ""
 "Upload a logo to the "
 "footer"
 msgstr ""
 
-#: functions/customizer.php:79
+#: functions/customizer.php:86
-msgid "Base Color Scheme"
+msgid ""
+"Display \"Proudly "
+"Powered by...\""
 msgstr ""
 
-#: functions/customizer.php:101
+#: functions/customizer.php:87
-msgid "Link Color"
+msgid ""
+"This checkbox shows the "
+"\"Proudly Powered by "
+"Tainacan and Wordpress\" "
+"sentence."
 msgstr ""
 
-#: functions/customizer.php:170
+#: functions/customizer.php:95
+msgid "Social Share"
+msgstr ""
+
+#: functions/customizer.php:110
+msgid ""
+"Display Facebook button"
+msgstr ""
+
+#: functions/customizer.php:124
+msgid ""
+"Display Twitter button"
+msgstr ""
+
+#: functions/customizer.php:134
+msgid ""
+"Twitter User to be cited "
+"in tweets (via @user)"
+msgstr ""
+
+#: functions/customizer.php:149
+msgid ""
+"Display Google Plus "
+"button"
+msgstr ""
+
+#: functions/customizer.php:162
+msgid ""
+"Choose a Color Scheme"
+msgstr ""
+
+#: functions/customizer.php:184
+msgid "Or pick any color"
+msgstr ""
+
+#: functions/customizer.php:195
+msgid "Tooltip Color"
+msgstr ""
+
+#: functions/customizer.php:307
 msgid "Default"
 msgstr ""
 
-#: functions/customizer.php:178
+#: functions/customizer.php:316
 msgid "Carmine"
 msgstr ""
 
-#: functions/customizer.php:186
+#: functions/customizer.php:325
 msgid "Cherry"
 msgstr ""
 
-#: functions/customizer.php:194
+#: functions/customizer.php:334
 msgid "Mustard"
 msgstr ""
 
-#: functions/customizer.php:202
+#: functions/customizer.php:343
 msgid "Mint Green"
 msgstr ""
 
-#: functions/customizer.php:210
+#: functions/customizer.php:352
 msgid "Dark Turquoise"
 msgstr ""
 
-#: functions/customizer.php:218
+#: functions/customizer.php:361
 msgid "Turquoise"
 msgstr ""
 
-#: functions/customizer.php:226
+#: functions/customizer.php:370
-msgid "Light Blue"
+msgid "Blue Heavenly"
 msgstr ""
 
-#: functions/customizer.php:234
+#: functions/customizer.php:379
 msgid "Purple"
 msgstr ""
 
-#: functions/customizer.php:242
+#: functions/customizer.php:388
 msgid "Violet"
 msgstr ""
 
-#: functions/single-functions.php:30
+#: functions/enqueues.php:55
+msgid "Show more"
+msgstr ""
+
+#: functions/enqueues.php:56
+msgid "Show less"
+msgstr ""
+
+#: functions/single-functions.php:28
+#, php-format
+msgid "%1$s at %2$s."
+msgstr ""
+
+#: functions/single-functions.php:37
 msgid ""
 "Your comment is awaiting "
 "moderation."
 msgstr ""
 
-#: functions/single-functions.php:35
+#: functions/single-functions.php:42
 msgid "Reply"
 msgstr ""
 
-#: functions/single-functions.php:42
+#: functions/single-functions.php:48
 msgid "Edit"
 msgstr ""
 
-#: functions/single-functions.php:46
+#: functions/single-functions.php:52
 msgid "Hide reply"
 msgstr ""
 
-#: tainacan/single-items.php:17
+#: functions/single-functions.php:73
+#, php-format
+msgid ""
+"Viewing Items: %d to %d "
+"from %d"
+msgstr ""
+
+#: functions/single-functions.php:107
+msgid "&nbsp;by&nbsp;"
+msgstr ""
+
+#: header.php:20
+#: searchform.php:3
+msgid "Search"
+msgstr ""
+
+#: lib/class-wp-bootstrap-navwalker.php:331
+msgid "Add a menu"
+msgstr ""
+
+#: tainacan/single-items.php:19
 #: template-parts/loop-singular.php:9
-#: template-parts/loop.php:17
+#: template-parts/loop.php:19
 msgid "Back"
 msgstr ""
 
-#: tainacan/single-items.php:26
+#: tainacan/single-items.php:40
-#: template-parts/single-post.php:6
+msgid "Document"
-msgid ", by "
 msgstr ""
 
-#: tainacan/single-items.php:29
+#: tainacan/single-items.php:77
-msgid "Content"
-msgstr ""
-
-#: tainacan/single-items.php:52
 msgid "Attachments"
 msgstr ""
 
-#: tainacan/single-items.php:71
+#: tainacan/single-items.php:106
-msgid "Informations"
+msgid "Information"
 msgstr ""
 
-#: tainacan/single-items.php:122
+#: tainacan/single-items.php:119
-#: template-parts/loop-singular.php:18
+msgid "Share"
-#: template-parts/loop-tainacan-collection-grid.php:28
+msgstr ""
-#: template-parts/loop-tainacan-collection-table.php:43
+
-#: template-parts/loop-tainacan-collection.php:35
+#: tainacan/single-items.php:123
-#: template-parts/loop.php:36
+#: template-parts/single-post.php:10
+msgid ""
+"Share this on facebook"
+msgstr ""
+
+#: tainacan/single-items.php:132
+#: template-parts/single-post.php:17
+msgid ""
+"Share this on twitter"
+msgstr ""
+
+#: tainacan/single-items.php:137
+#: template-parts/single-post.php:22
+msgid ""
+"Share this on google plus"
+msgstr ""
+
+#: tainacan/single-items.php:182
+#: template-parts/loop-singular.php:24
+#: template-parts/loop-tainacan-collection-grid.php:30
+#: template-parts/loop-tainacan-collection-table.php:36
+#: template-parts/loop-tainacan-collection.php:37
+#: template-parts/loop.php:34
 msgid "Nothing found"
 msgstr ""
 
-#: template-parts/bannerheader.php:18
+#: tainacan/view-mode-grid.php:22
+msgid ""
+"Thumbnail placeholder"
+msgstr ""
+
+#: tainacan/view-mode-grid.php:41
+msgid "No item was found."
+msgstr ""
+
+#: template-parts/bannerheader.php:11
 msgid "Search Results"
 msgstr ""
 
-#: template-parts/bannerheader.php:26
+#: template-parts/bannerheader.php:17
 #, php-format
 msgid "Daily Archives: %s"
 msgstr ""
 
-#: template-parts/bannerheader.php:29
+#: template-parts/bannerheader.php:19
 #, php-format
 msgid ""
 "Monthly Archives: %s"
 msgstr ""
 
-#: template-parts/bannerheader.php:29
+#: template-parts/bannerheader.php:19
 msgctxt ""
 "monthly archives date "
 "format"
 msgid "F Y"
 msgstr ""
 
-#: template-parts/bannerheader.php:32
+#: template-parts/bannerheader.php:21
 #, php-format
 msgid "Yearly Archives: %s"
 msgstr ""
 
-#: template-parts/bannerheader.php:32
+#: template-parts/bannerheader.php:21
 msgctxt ""
 "yearly archives date "
 "format"
 msgid "Y"
 msgstr ""
 
-#: template-parts/list-post.php:12
+#: template-parts/list-post.php:16
-msgid "for"
-msgstr ""
-
-#: template-parts/list-post.php:13
 msgid "Read more..."
 msgstr ""
 
-#: template-parts/loop-tainacan-collection-table.php:9
+#: template-parts/loop-singular.php:18
+msgid ""
+"<span class=\"meta-nav"
+"\">&larr;</span> Previous"
+msgstr ""
+
+#: template-parts/loop-singular.php:19
+msgid ""
+"Next <span class=\"meta-"
+"nav\">&rarr;</span>"
+msgstr ""
+
+#: template-parts/loop-tainacan-collection-table.php:8
 msgid "Description"
 msgstr ""
 
-#: template-parts/loop.php:7
+#: template-parts/loop-tainacan-collection.php:24
-msgid "Posts of blog"
+msgid ""
+"Description not informed"
 msgstr ""
 
-#: template-parts/loop.php:9
+#: template-parts/loop.php:10
+msgid "Blog Posts"
+msgstr ""
+
+#: template-parts/loop.php:13
 msgid "Search Results for"
 msgstr ""
 
-#: template-parts/single-post.php:23
+#: template-parts/single-post.php:37
+msgid "Pages:"
+msgstr ""
+
+#: template-parts/single-post.php:46
 msgid "Category: "
 msgstr ""
 
-#: template-parts/single-post.php:28
+#: template-parts/single-post.php:51
-msgid "Comments"
+msgid "Comments: "
 msgstr ""
 
-#: template-parts/single-post.php:29
+#: template-parts/single-post.php:52
 msgid "None"
 msgstr ""
-
-#: vendor/class-wp-bootstrap-navwalker.php:366
-msgid "Add a menu"
-msgstr ""

src/searchform.php

@@ -1,4 +1,4 @@
-<form role="search" method="get" class="search-form" action="<?php echo home_url( '/' ); ?>">
+<form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<div class="input-group border">
 		<input class="form-control py-2 border-0" type="search" name="s" placeholder="<?php esc_attr_e( 'Search', 'tainacan-interface' ); ?>" id="tainacan-search">
 		<span class="input-group-append d-none d-md-block">

src/tainacan/single-items.php

@@ -120,21 +120,21 @@
 													<div class="btn-group" role="group">
 														<?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?> 
 															<a href="http://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" class="item-card-link--sharing" target="_blank">
-																<img src="<?php echo get_template_directory_uri() . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
+																<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
 															</a>
 														<?php endif; ?>
 														<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) ) : ?> 
 															<?php
-															$twitter_option = get_option( 'tainacan_twitter_user' );
+															$twitter_option = get_theme_mod( 'tainacan_twitter_user' );
-															$via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_option( 'tainacan_twitter_user' ) ) : '';
+															$via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_theme_mod( 'tainacan_twitter_user' ) ) : '';
 															?>
 															<a href="http://twitter.com/share?url=<?php the_permalink(); ?>&amp;text=<?php the_title_attribute(); ?><?php echo $via; ?>" target="_blank" class="item-card-link--sharing">
-																<img src="<?php echo get_template_directory_uri() . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
+																<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
 															</a>
 														<?php endif; ?>
 														<?php if ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?> 
 															<a href="https://plus.google.com/share?url=<?php the_permalink(); ?>" target="_blank" class="item-card-link--sharing">
-																<img src="<?php echo get_template_directory_uri() . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>">
+																<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>">
 															</a>
 														<?php endif; ?>
 													</div>

src/tainacan/view-mode-grid.php

@@ -17,7 +17,7 @@
 					</div>
 				<?php else : ?>
 					<div 
-							style="background-image: url(<?php echo get_template_directory_uri() . '/assets/images/thumbnail_placeholder.png'?>)"
+							style="background-image: url(<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/thumbnail_placeholder.png'?>)"
 							class="grid-item-thumbnail">
 						<?php echo '<img alt="', esc_attr_e('Thumbnail placeholder', 'tainacan-interface'), '" src="', get_template_directory_uri(), '/assets/images/thumbnail_placeholder.png">'?>
 						<div class="skeleton"></div> 

src/template-parts/bannerheader.php

@@ -1,4 +1,4 @@
-<div <?php if ( get_header_image() ) : ?>class="page-header header-filter clear-filter page-height" style="background-image: url('<?php header_image(); ?>')"<?php else : ?>class="page-header header-filter clear-filter align-items-center" style="background-image: url('<?php echo get_template_directory_uri() ?>/assets/images/capa.png')"<?php endif; ?>>
+<div <?php if ( get_header_image() ) : ?>class="page-header header-filter clear-filter page-height" style="background-image: url('<?php header_image(); ?>')"<?php else : ?>class="page-header header-filter clear-filter align-items-center" style="background-image: url('<?php echo esc_url( get_template_directory_uri() ) ?>/assets/images/capa.png')"<?php endif; ?>>
 	<div class="container-fluid max-large p-0 ph-title-description">
 		<div class="bg-white-title title-header <?php if ( is_singular() || is_archive() || is_search() || is_home() ) { echo 'singular-title'; }?>">
 			<h1 class="mb-0 text-truncate">

src/template-parts/header-social-share.php

@@ -22,9 +22,9 @@
 				</a>
 			</div>
 		<?php endif; ?>
-		<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) && get_option( 'tainacan_twitter_user' ) ) : ?>
+		<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) && get_theme_mod( 'tainacan_twitter_user' ) ) : ?>
 			<div class="rotater">
-				<a href="http://twitter.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>&amp;text=<?php the_title_attribute(); ?>&amp;via=<?php echo esc_attr( get_option( 'tainacan_twitter_user', '' ) ); ?>" target="_blank">
+				<a href="http://twitter.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>&amp;text=<?php the_title_attribute(); ?>&amp;via=<?php echo esc_attr( get_theme_mod( 'tainacan_twitter_user', '' ) ); ?>" target="_blank">
 					<div class="btn btn-icon">
 						<i class="mdi mdi-twitter"></i>
 					</div>

src/template-parts/headercollection.php

@@ -23,7 +23,7 @@ if ( $background_color ) {
 echo '</style>';
 ?>
 
-<div <?php if ( get_header_image() ) : ?>class="page-header header-filter page-height" style="background-image: url('<?php header_image(); ?>')"<?php else : ?>class="page-header header-filter page-collection" style="background-image: url('<?php echo get_template_directory_uri() ?>/assets/images/capa.png')"<?php endif; ?>>
+<div <?php if ( get_header_image() ) : ?>class="page-header header-filter page-height" style="background-image: url('<?php header_image(); ?>')"<?php else : ?>class="page-header header-filter page-collection" style="background-image: url('<?php echo esc_url( get_template_directory_uri() ) ?>/assets/images/capa.png')"<?php endif; ?>>
 	<div class="container-fluid px-0 t-bg-collection" style="<!-- z-index: 0; -->">
 		<div class="collection-header position-relative max-large" style="">
 			<?php do_action( 'tainacan-interface-collection-header' ); ?>
@@ -48,7 +48,7 @@ echo '</style>';
 				<div class="icons">
 					<?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?> 
 						<div class="rotater">
-							<a href="http://www.facebook.com/sharer.php?u=<?php echo home_url( $wp->request ); ?>" target="_blank">
+							<a href="http://www.facebook.com/sharer.php?u=<?php echo esc_url( home_url( $wp->request ) ); ?>" target="_blank">
 								<div class="btn btn-icon">
 									<i class="mdi mdi-facebook"></i>
 								</div>
@@ -57,16 +57,16 @@ echo '</style>';
 					<?php endif; ?>
 					<?php if ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?> 
 						<div class="rotater">
-							<a href="https://plus.google.com/share?url=<?php echo home_url( $wp->request ); ?>" target="_blank">
+							<a href="https://plus.google.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>" target="_blank">
 								<div class="btn btn-icon">
 									<i class="mdi mdi-google-plus"></i>
 								</div>
 							</a>
 						</div>
 					<?php endif; ?>
-					<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) && get_option( 'tainacan_twitter_user' ) ) : ?> 
+					<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) && get_theme_mod( 'tainacan_twitter_user' ) ) : ?> 
 						<div class="rotater">
-							<a href="http://twitter.com/share?url=<?php echo home_url( $wp->request ); ?>&amp;text=<?php the_title_attribute(); ?>&amp;via=<?php echo esc_attr( get_option( 'tainacan_twitter_user', '' ) ); ?>" target="_blank">
+							<a href="http://twitter.com/share?url=<?php echo esc_url( home_url( $wp->request ) ); ?>&amp;text=<?php the_title_attribute(); ?>&amp;via=<?php echo esc_attr( get_theme_mod( 'tainacan_twitter_user', '' ) ); ?>" target="_blank">
 								<div class="btn btn-icon">
 									<i class="mdi mdi-twitter"></i>
 								</div>

src/template-parts/loop-tainacan-collection-table.php

@@ -6,8 +6,6 @@
 					<th scope="col"></th>
 					<th scope="col"><?php _e( 'Title', 'tainacan-interface' ); ?></th>
 					<th scope="col"><?php _e( 'Description', 'tainacan-interface' ); ?></th>
-					<!-- <th scope="col"><?php //_e( 'Date' ); ?></th>
-					<th scope="col"><?php //_e( 'Author' ); ?></th> -->
 				</tr>
 			</thead>
 			<tbody>
@@ -26,8 +24,6 @@
 						</td>
 						<td class="collection-title text-black"><?php the_title(); ?></td>
 						<td class="collection-description text-oslo-gray"><?php the_excerpt(); ?></td>
-						<!-- <td class="collection-date text-oslo-gray"><?php //echo get_the_date(); ?></td>
-						<td class="collection-create-by text-oslo-gray"><?php //_e( 'Created by', 'tainacan-interface' ); ?> <?php the_author_posts_link(); ?></td> -->
 					</tr>
 				<?php endwhile; ?>
 			</tbody>

src/template-parts/menubellowbanner.php

@@ -6,18 +6,17 @@
 			<button class="navbar-toggler text-heavy-metal border-0 px-2 pt-2" type="button" data-toggle="collapse" data-target="#menubelowHeader" aria-controls="menubelowHeader" aria-expanded="false" aria-label="Toggle navigation">	
 				<span class="navbar-toggler-icon"></span>	
 			</button>
-			<?php /* if(wp_is_mobile()) echo $bread; */ ?>
+			<?php
-				<?php
+				wp_nav_menu( array(
-					wp_nav_menu( array(
+					'theme_location'  => 'navMenubelowHeader',
-						'theme_location'  => 'navMenubelowHeader',
+					'container'       => 'div',
-						'container'       => 'div',
+					'container_class' => 'collapse navbar-collapse',
-						'container_class' => 'collapse navbar-collapse',
+					'container_id'    => 'menubelowHeader',
-						'container_id'    => 'menubelowHeader',
+					'menu_class'      => 'navbar-nav mr-auto',
-						'menu_class'      => 'navbar-nav mr-auto',
+					'fallback_cb'     => 'WP_Bootstrap_Navwalker::fallback',
-						'fallback_cb'     => 'WP_Bootstrap_Navwalker::fallback',
+					'walker'          => new WP_Bootstrap_Navwalker(),
-						'walker'          => new WP_Bootstrap_Navwalker(),
+				) );
-					) );
+			?>
-				?>
 		</div>
 	</nav>
 <?php endif; ?>

src/template-parts/single-post.php

@@ -7,19 +7,19 @@
 			<div class="btn-group ml-auto" role="group">
 				<?php if ( true == get_theme_mod( 'tainacan_facebook_share', true ) ) : ?> 
 					<a href="http://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" class="" target="_blank">
-						<img src="<?php echo get_template_directory_uri() . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
+						<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/facebook-circle.png'; ?>" alt="<?php esc_attr_e('Share this on facebook', 'tainacan-interface') ?>">
 					</a>
 				<?php endif; ?>
 				<?php if ( true == get_theme_mod( 'tainacan_twitter_share', true ) ) : ?> 
-					<?php $twitter_option = get_option( 'tainacan_twitter_user' ); ?>
+					<?php $twitter_option = get_theme_mod( 'tainacan_twitter_user' ); ?>
-					<?php $via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_option( 'tainacan_twitter_user' ) ) : ''; ?>
+					<?php $via = ! empty( $twitter_option ) ? '&amp;via=' . esc_attr( get_theme_mod( 'tainacan_twitter_user' ) ) : ''; ?>
 					<a href="http://twitter.com/share?url=<?php the_permalink(); ?>&amp;text=<?php the_title_attribute(); ?><?php echo $via; ?>" target="_blank" class="">
-						<img src="<?php echo get_template_directory_uri() . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
+						<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/twitter-circle.png'; ?>" alt="<?php esc_attr_e('Share this on twitter', 'tainacan-interface') ?>">
 					</a>
 				<?php endif; ?>
 				<?php if ( true == get_theme_mod( 'tainacan_google_share', true ) ) : ?> 
 					<a href="https://plus.google.com/share?url=<?php the_permalink(); ?>" target="_blank" class="">
-						<img src="<?php echo get_template_directory_uri() . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>">
+						<img src="<?php echo esc_url( get_template_directory_uri() ) . '/assets/images/google-plus-circle.png'; ?>" alt="<?php esc_attr_e('Share this on google plus', 'tainacan-interface') ?>">
 					</a>
 				<?php endif; ?>
 			</div>