Skip to content

Commit

Permalink
Merge pull request #7 from templaza/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@tuyencntt
tuyencntt authored Dec 17, 2024
2 parents b60ace0 + 68b6502 commit c411d1d
Show file tree
Hide file tree
Showing 34 changed files with 33 additions and 185 deletions.
42 changes: 0 additions & 42 deletions includes/ui-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,48 +89,6 @@ public static function add_attributes($key='attribute', $attributes = array()){
self::$cache[$store_id] = $attributes;
}

// public static function merge_array($source, $destination, $recursive = true, $allowNull = false){
// return Array_Helper::merge($source, $destination, $recursive, $allowNull);
// }
//
// public static function get_framework_logo_url(){
// $logo_url = self::get_my_url();
// $log_path = AMI_CODE_MANAGER.'/assets/images/logo.svg';
// if(file_exists($log_path)){
// return $logo_url.'/assets/images/logo.svg';
// }
// return '';
// }
//
// /**
// * Get theme's default logo when option has not set in config
// * Note: your logo file should have in your theme base folder. Ex: your-theme/assets/images
// * @param string $file_name
// * @param array|string $files_ext
// * @param string $base_folder
// * @return string
// * */
// public static function get_theme_default_logo_url($file_name, $files_ext = array('.svg', '.png'), $base_folder = 'assets/images'){
//
// if(empty($file_name) || empty($files_ext) || empty($base_folder)){
// return '';
// }
//
// $logo_url = $logo_path = '/'.$base_folder.'/'.$file_name;
// $logo_url = get_template_directory_uri().$logo_url;
// $logo_path = get_template_directory().$logo_path;
//
// if(is_array($files_ext)){
// foreach($files_ext as $ext){
// if(file_exists($logo_path.$ext)){
// return $logo_url.$ext;
// }
// }
// }elseif(is_string($files_ext) && $logo_path.$files_ext){
// return $logo_url.$files_ext;
// }
// return '';
// }

/**
* Check url is external
Expand Down
3 changes: 1 addition & 2 deletions uipro.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: https://github.com/templaza/uipro
Description: This plugin help you manage products.
Author: Templaza
Version: 1.1.0
Version: 1.1.1
Text Domain: uipro
Author URI: http://templaza.com
Forum: https://www.templaza.com/Forums.html
Expand Down Expand Up @@ -109,7 +109,6 @@ public function init_elements() {
if(isset($this -> cache[$store_id])){
return $this -> cache[$store_id];
}

foreach ( $elements as $plugin => $group ) {
for ($i=0;$i<count( $group);$i++) {
$element = $group[$i];
Expand Down
3 changes: 1 addition & 2 deletions widgets/circletext/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;


if ( ! class_exists( 'UIPro_Config_CircleText' ) ) {
/**
Expand Down Expand Up @@ -66,7 +66,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'text_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Content Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon content.', 'uipro'),
'selector' => '{{WRAPPER}} .circletext textPath',
Expand Down
4 changes: 1 addition & 3 deletions widgets/heading/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;


if ( ! class_exists( 'UIPro_Config_Heading' ) ) {
/**
Expand Down Expand Up @@ -959,7 +959,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'typography',
'scheme' => Typography::TYPOGRAPHY_1,
'selector' => '{{WRAPPER}} .heading-highlighted-wrapper',
'start_section' => 'style',
'section_tab' => Controls_Manager::TAB_STYLE,
Expand All @@ -969,7 +968,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'sub_heading_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Sub Heading Typography', 'uipro'),
'selector' => '{{WRAPPER}} .sub-heading',
'section_name' => esc_html__( self::$name, 'uipro' ),
Expand Down
6 changes: 1 addition & 5 deletions widgets/list-post/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
defined( 'ABSPATH' ) || exit;

use Elementor\Controls_Manager;
use Elementor\Core\Schemes\Typography;
use Elementor\Group_Control_Typography;


if ( ! class_exists( 'UIPro_Config_List_Post' ) ) {
/**
* Class UIPro_Config_Accordion
Expand Down Expand Up @@ -394,7 +394,6 @@ public function get_options() {
'type' => Group_Control_Typography::get_type(),
'name' => 'typography',
'label' => esc_html__('Typography'),
'scheme' => Typography::TYPOGRAPHY_1,
'start_section' => 'style',
'section_tab' => Controls_Manager::TAB_STYLE,
'section_name' => esc_html__( self::$name, 'uipro' ),
Expand All @@ -404,23 +403,20 @@ public function get_options() {
'type' => Group_Control_Typography::get_type(),
'name' => 'meta_typography',
'label' => esc_html__('Post Count Typography'),
'scheme' => Typography::TYPOGRAPHY_1,
'section_name' => esc_html__( self::$name, 'uipro' ),
'selector' => '{{WRAPPER}} .number-posts',
),
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'post_title_typography',
'label' => esc_html__('Post Title Typography'),
'scheme' => Typography::TYPOGRAPHY_1,
'section_name' => esc_html__( self::$name, 'uipro' ),
'selector' => '{{WRAPPER}} .article-heading',
),
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'link_all_typography',
'label' => esc_html__('Link All Typography'),
'scheme' => Typography::TYPOGRAPHY_1,
'section_name' => esc_html__( self::$name, 'uipro' ),
'selector' => '{{WRAPPER}} .read-more',
),
Expand Down
2 changes: 1 addition & 1 deletion widgets/templaza-image/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use Elementor\Controls_Manager;
use Elementor\Group_Control_Box_Shadow;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;


if ( ! class_exists( 'UIPro_Config_Templaza_Image' ) ) {
/**
Expand Down
6 changes: 1 addition & 5 deletions widgets/templaza-testimonial/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;


if ( ! class_exists( 'UIPro_Config_Templaza_Testimonial' ) ) {
/**
Expand Down Expand Up @@ -1426,7 +1426,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'quote_title_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Title Font', 'uipro'),
'selector' => '{{WRAPPER}} .templaza_quote_title',
'separator' => 'before',
Expand All @@ -1443,7 +1442,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'quote_content_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Content Font', 'uipro'),
'selector' => '{{WRAPPER}} .templaza_quote_content',
'separator' => 'before',
Expand Down Expand Up @@ -1476,7 +1474,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'quote_author_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Author Font', 'uipro'),
'selector' => '{{WRAPPER}} .templaza_quote_author',

Expand All @@ -1492,7 +1489,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'quote_designation_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Designation Font', 'uipro'),
'selector' => '{{WRAPPER}} .templaza_quote_author_position',

Expand Down
5 changes: 1 addition & 4 deletions widgets/uiaccordion/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;


if ( ! class_exists( 'UIPro_Config_UIAccordion' ) ) {
/**
Expand Down Expand Up @@ -307,7 +307,6 @@ public function get_options() {
array(
'name' => 'title_font_family',
'type' => Group_Control_Typography::get_type(),
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Title Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon content.', 'uipro'),
'selector' => '{{WRAPPER}} .tz-title',
Expand Down Expand Up @@ -360,7 +359,6 @@ public function get_options() {
array(
'name' => 'content_font_family',
'type' => Group_Control_Typography::get_type(),
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Content Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon content.', 'uipro'),
'selector' => '{{WRAPPER}} .ui-content',
Expand Down Expand Up @@ -703,7 +701,6 @@ public function get_options() {
array(
'name' => 'button_font_family',
'type' => Group_Control_Typography::get_type(),
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Button Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon content.', 'uipro'),
'selector' => '{{WRAPPER}} .uk-button',
Expand Down
4 changes: 1 addition & 3 deletions widgets/uiadvanced-products-filter/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;


//require_once __DIR__.'/helper.php';

Expand Down Expand Up @@ -449,7 +449,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'title_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Title Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon title.', 'uipro'),
'selector' => '{{WRAPPER}} .inventory-title-search',
Expand All @@ -463,7 +462,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'label_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Label Font', 'uipro'),
'description' => esc_html__('Select a font family for label.', 'uipro'),
'selector' => '{{WRAPPER}} .advanced-product-search-form .search-label',
Expand Down
4 changes: 1 addition & 3 deletions widgets/uiadvancedproduct-category/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
defined( 'ABSPATH' ) || exit;
use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;

require_once plugin_dir_path( __DIR__ ).'uiadvancedproducts/helper.php';
if ( ! class_exists( 'UIPro_Config_Uiadvancedproduct_Category' ) ) {
/**
Expand Down Expand Up @@ -783,7 +783,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'title_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Title Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon title.', 'uipro'),
'selector' => '{{WRAPPER}} .ap-title',
Expand Down Expand Up @@ -906,7 +905,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'count_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Product Count Font', 'uipro'),
'description' => esc_html__('Select a font family.', 'uipro'),
'selector' => '{{WRAPPER}} .ap-product-count',
Expand Down
9 changes: 1 addition & 8 deletions widgets/uiadvancedproduct-slideshow/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
defined( 'ABSPATH' ) || exit;
use Elementor\Controls_Manager;
use Elementor\Group_Control_Typography;
use Elementor\Core\Schemes\Typography;

require_once plugin_dir_path( __DIR__ ).'uiadvancedproducts/helper.php';
if ( ! class_exists( 'UIPro_Config_Uiadvancedproduct_Slideshow' ) ) {
/**
Expand Down Expand Up @@ -345,7 +345,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'title_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Title Font', 'uipro'),
'description' => esc_html__('Select a font family, font size for the addon title.', 'uipro'),
'selector' => '{{WRAPPER}} .ap-slideshow-title',
Expand Down Expand Up @@ -391,7 +390,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'field_label_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Field Label Font', 'uipro'),
'selector' => '{{WRAPPER}} .ap-field-label',
),
Expand All @@ -406,7 +404,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'field_value_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Field Value Font', 'uipro'),
'selector' => '{{WRAPPER}} .ap-field-value',
),
Expand All @@ -421,7 +418,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'desc_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Description Font', 'uipro'),
'selector' => '{{WRAPPER}} .ap-single-desc',
'start_section' => 'ap-desc',
Expand All @@ -438,7 +434,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'custom_meta_desc_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Custom Meta Description Font', 'uipro'),
'selector' => '{{WRAPPER}} .ap-custom-meta',
'start_section' => 'ap-desc-custom',
Expand All @@ -455,7 +450,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'custom_desc_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Custom Description Font', 'uipro'),
'selector' => '{{WRAPPER}} .ap-custom-desc',
),
Expand Down Expand Up @@ -491,7 +485,6 @@ public function get_options() {
array(
'type' => Group_Control_Typography::get_type(),
'name' => 'button_typography',
'scheme' => Typography::TYPOGRAPHY_1,
'label' => esc_html__('Button Font', 'uipro'),
'selector' => '{{WRAPPER}} .ui-button',
),
Expand Down
Loading

0 comments on commit c411d1d

Please sign in to comment.