Changeset 1951084
- Timestamp:
- 10/03/2018 08:18:41 PM (8 years ago)
- Location:
- thrivehive/trunk
- Files:
-
- 4 edited
-
README.md (modified) (1 diff)
-
controllers/changeling.php (modified) (6 diffs)
-
controllers/menus.php (modified) (1 diff)
-
thrivehive.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
thrivehive/trunk/README.md
r1949915 r1951084 80 80 81 81 ## Changelog 82 * V 2.201 Bugfix for newly spun up Changeling sites data not loading 83 * V 2.2 Added endpoint to expose the website vertical/template 82 * V 2.2 - Added endpoint to expose the website vertical/template 84 83 * V 2.1 Added endpoint to search for Global Styling categories and values 85 84 * V 2.0 Enable support for new ThriveHive website editor -
thrivehive/trunk/controllers/changeling.php
r1949915 r1951084 79 79 global $json_api; 80 80 if(isset($_REQUEST['css'])) { 81 // We must save custom CSS files to the uploads directory, otherwise they would be destroyed by theme updates 82 $upload_dir = wp_upload_dir(); 83 $changeling_css_dir = $upload_dir['basedir'] . '/changeling-css'; 84 $compiled_bootstrap_css_file_location = $changeling_css_dir .'/theme-user-custom.css'; 85 $compiled_bootstrap_minified_css_file_location = $changeling_css_dir .'/theme-user-custom.min.css'; 86 $compiled_bootstrap_sourcemap_file_location = $changeling_css_dir .'/theme-user-custom.css.map'; 81 $stylesheet_directory = get_stylesheet_directory(); 82 $compiled_bootstrap_css_file_location = $stylesheet_directory.'/css/child-theme.css'; 83 $compiled_bootstrap_minified_css_file_location = $stylesheet_directory.'/css/child-theme.min.css'; 84 $compiled_bootstrap_sourcemap_file_location = $stylesheet_directory.'/css/child-theme.css.map'; 87 85 88 86 $css = $_REQUEST['css']; 89 87 $minified = $_REQUEST['minified']; 90 88 $map = $_REQUEST['sourceMap']; 91 92 if (!file_exists($changeling_css_dir)) {93 wp_mkdir_p($changeling_css_dir);94 }95 89 96 90 file_put_contents($compiled_bootstrap_css_file_location, $css); … … 114 108 global $json_api; 115 109 116 $stylesheet_dir = get_stylesheet_directory(); 117 $upload_dir = wp_upload_dir(); 118 $changeling_css_dir = $upload_dir['basedir'] . '/changeling-css'; 119 $user_css = $changeling_css_dir . '/theme-user-custom.min.css'; 120 $default_css = $stylesheet_dir . '/css/theme-default.min.css'; 121 122 $compiled_minified_css_path = (file_exists($user_css) ? $user_css : $default_css); 110 $compiled_minified_css_path = get_stylesheet_directory().'/css/child-theme.min.css'; 123 111 $compiled_minified_css = file_get_contents($compiled_minified_css_path); 124 112 … … 133 121 public function get_bootstrap_assets(){ 134 122 global $json_api; 135 $theme_dir_uri = get_stylesheet_directory ();123 $theme_dir_uri = get_stylesheet_directory_uri(); 136 124 137 125 $bootstrap_files = $theme_dir_uri . '/config/virtual-file-system.json'; … … 152 140 public function get_bootstrap_theme_config(){ 153 141 global $json_api; 154 $theme_dir_uri = get_stylesheet_directory ();142 $theme_dir_uri = get_stylesheet_directory_uri(); 155 143 $category = $_REQUEST['category']; 156 144 $query = $_REQUEST['query']; … … 194 182 public function get_bootstrap_theme_config_settings(){ 195 183 global $json_api; 196 $theme_dir_uri = get_stylesheet_directory ();184 $theme_dir_uri = get_stylesheet_directory_uri(); 197 185 198 186 $theme_config_settings_full_path = $theme_dir_uri . '/config/theme-config-settings.json'; … … 209 197 public function filter_bootstrap_categories(){ 210 198 global $json_api; 211 $theme_dir_uri = get_stylesheet_directory ();199 $theme_dir_uri = get_stylesheet_directory_uri(); 212 200 $theme_config_path = '/config/theme-config.json'; 213 201 $query = $_REQUEST['query']; -
thrivehive/trunk/controllers/menus.php
r1949915 r1951084 815 815 $this->set_theme_logo($image_data[1], $image_data[2], $image_data[0]); 816 816 $this->set_theme_logo2($image_data[0], $image_data[1], $image_data[2], $logo_id); 817 } 818 } 819 820 if( !is_thrivehive_wysiwyg() ) 821 { 822 $this->set_footer(); 823 } 817 } 818 } 819 $this->set_footer(); 824 820 825 821 return array(); 826 822 } 823 827 824 828 825 private function set_footer() { -
thrivehive/trunk/thrivehive.php
r1949915 r1951084 5 5 *Plugin URI: http://thrivehive.com 6 6 *Description: A plugin to include ThriveHive's tracking code 7 *Version: 2.2 017 *Version: 2.2 8 8 *Author: ThriveHive 9 9 *Author URI: http://thrivehive.com
Note: See TracChangeset
for help on using the changeset viewer.