Changeset 1546829
- Timestamp:
- 12/06/2016 11:58:48 PM (9 years ago)
- Location:
- contentad
- Files:
-
- 27 added
- 1 deleted
- 7 edited
-
tags (modified) (1 prop)
-
tags/1.1.16 (deleted)
-
tags/1.1.17 (added)
-
tags/1.1.17/contentad.php (added)
-
tags/1.1.17/css (added)
-
tags/1.1.17/css/admin.css (added)
-
tags/1.1.17/images (added)
-
tags/1.1.17/images/big_red_x.png (added)
-
tags/1.1.17/images/ca_icon.png (added)
-
tags/1.1.17/images/ca_logo.png (added)
-
tags/1.1.17/images/numbers.png (added)
-
tags/1.1.17/images/sm_icon_active.png (added)
-
tags/1.1.17/images/sm_icon_inactive.png (added)
-
tags/1.1.17/includes (added)
-
tags/1.1.17/includes/admin (added)
-
tags/1.1.17/includes/admin/admin.class.php (added)
-
tags/1.1.17/includes/admin/wp3-menu-fix.class.php (added)
-
tags/1.1.17/includes/api.class.php (added)
-
tags/1.1.17/includes/images.class.php (added)
-
tags/1.1.17/includes/init.class.php (added)
-
tags/1.1.17/includes/post-type.class.php (added)
-
tags/1.1.17/includes/shortcode.class.php (added)
-
tags/1.1.17/includes/tbclose.php (added)
-
tags/1.1.17/includes/widget.class.php (added)
-
tags/1.1.17/js (added)
-
tags/1.1.17/js/admin.js (added)
-
tags/1.1.17/js/settings.js (added)
-
tags/1.1.17/readme.txt (added)
-
tags/1.1.17/wp-package.json (added)
-
trunk/contentad.php (modified) (2 diffs)
-
trunk/includes/admin/admin.class.php (modified) (2 diffs)
-
trunk/includes/post-type.class.php (modified) (5 diffs)
-
trunk/js/admin.js (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/wp-package.json (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
contentad/tags
-
Property
svn:ignore
set to
1.0.0
-
Property
svn:ignore
set to
-
contentad/trunk/contentad.php
r1494857 r1546829 5 5 * Plugin URI: https://wordpress.org/plugins/contentad/ 6 6 * Description: Content.ad enables blog owners to display ads or related blog posts (from their own blog) in a "lead me to more content" section. The ads are sourced dynamically from the Content.ad system and can be a source of revenue for the blog owner. 7 * Version: 1.1.1 67 * Version: 1.1.17 8 8 * Author: Content.ad 9 9 * Author URI: https://www.content.ad … … 42 42 } 43 43 44 define( 'CONTENTAD_VERSION', '1.1.1 6' );44 define( 'CONTENTAD_VERSION', '1.1.17' ); 45 45 define( 'CONTENTAD_FILE', get_contentad_file() ); 46 46 define( 'CONTENTAD_PATH', plugin_dir_path( CONTENTAD_FILE ) ); -
contentad/trunk/includes/admin/admin.class.php
r1494857 r1546829 93 93 ) ); 94 94 $installation_code_url = CONTENTAD_REMOTE_URL . "Publisher/Widgets/InstallationCode?{$installation_code_query}"; 95 wp_enqueue_script( 'contentad.admin.js', plugins_url( 'js/', CONTENTAD_FILE ).'admin.js', array('jquery','thickbox'), CONTENTAD_VERSION ); 95 wp_enqueue_script( 'contentad.admin.js', plugins_url( 'js/', CONTENTAD_FILE ).'admin.js', array('jquery','thickbox','suggest'), CONTENTAD_VERSION ); 96 // Register hooks 96 97 wp_localize_script( 'contentad.admin.js', 'ContentAd', array( 97 98 'action' => 'edit_contentad_widget', … … 108 109 'installationCodeCall' => $installation_code_url, 109 110 'pluginsUrl' => plugins_url(), 111 'tags' => get_tags('post_tag', array('hide_empty' => false)) 110 112 ) ); 111 113 } -
contentad/trunk/includes/post-type.class.php
r1494857 r1546829 165 165 case 'placement': 166 166 $possible_placements = array( 167 'after_post_content' => __('After Post Content', 'contentad'),168 'before_post_content' => __('Before Post Content', 'contentad'),169 'in_widget' => __('In Widget', 'contentad'),167 'after_post_content' => __('After post content', 'contentad'), 168 'before_post_content' => __('Before post content', 'contentad'), 169 'in_widget' => __('In widget', 'contentad'), 170 170 'in_function' => __('In a template tag', 'contentad'), 171 'popup_or_mobile_slidup' => __('Popup or Mobile Slideup', 'contentad')171 'popup_or_mobile_slidup' => __('Popup or mobile slideup', 'contentad') 172 172 ); 173 173 $actual_placement = get_post_meta( $post_id, 'placement', true ); … … 267 267 $tags = explode(',', preg_replace( '/, /', ',', strip_tags( implode(" ", $_POST['post_tag']) ) )); 268 268 $terms = array(); 269 $terms = array_unique($terms); 269 270 foreach( $tags as $tag ) { 270 271 $term = get_term_by( 'name', $tag, 'post_tag' ); 271 272 if( $term ) { 272 273 $terms[] = $term->name; 274 } else { 275 wp_insert_term( $tag, 'post_tag' ); 276 contentAd_append_to_log( ' ADDING NEW EXCLUSION TAGS: ' . join( ', ', $return ) ); 277 $terms[] = $tag; 278 $new_terms[] = $tag; 273 279 } 280 } 281 if($new_terms) { 282 contentAd_append_to_log( ' ADDING NEW EXCLUSION TAGS: ' . join( ', ', $new_terms ) ); 274 283 } 275 284 contentAd_append_to_log( ' UPDATING EXCLUSION TAGS FOR POST ('.$post_id.') TO: ' . join( ', ', $terms ) ); … … 299 308 <fieldset class="inline-edit-col-left inline-edit-placement"> 300 309 <div class="inline-edit-col"> 301 <span class="title inline-edit-placement-label"><?php _e('Place Ads:', 'contentad') ?></span>310 <span class="title inline-edit-placement-label"><?php _e('Place widgets', 'contentad') ?></span> 302 311 <div><?php foreach( $options as $key => $value ): ?> 303 312 <label for="<?php esc_attr_e($key) ?>"> … … 358 367 359 368 <span class="title inline-edit-categories-label"> 360 <?php _e('Exclude from categories', 'contentad'); ?> 361 <span class="catshow"><?php _e('[more]', 'contentad' ); ?></span> 362 <span class="cathide" style="display:none;"><?php _e('[less]', 'contentad' ); ?></span> 369 <?php _e('Exclude widget from categories', 'contentad'); ?> 363 370 </span> 364 371 … … 383 390 if ( current_user_can( $tag->cap->assign_terms ) ) : ?> 384 391 <label class="inline-edit-tags"> 385 <span class="title"><?php _e('Exclude from tags', 'contentad'); ?></span>386 <textarea id="contentad_exc_tags" cols="22" rows="1" name="<?php esc_attr_e( $tag->name ); ?>[]" class="<?php esc_attr_e( $tag->name ); ?>"></textarea>392 <span class="title"><?php _e('Exclude widget from tags', 'contentad'); ?></span> 393 <textarea cols="22" rows="1" name="<?php esc_attr_e( $tag->name ); ?>[]" class="contentad_exc_tags <?php esc_attr_e( $tag->name ); ?>"></textarea> 387 394 </label> 388 395 <?php endif; -
contentad/trunk/js/admin.js
r1494857 r1546829 268 268 // Assign tags 269 269 if( excTags ) { 270 $('#contentad_exc_tags').html( excTags ); 271 } else { 272 $('#contentad_exc_tags').html( '' ); 270 $('.contentad_exc_tags').html( excTags ); 271 } else { 272 $('.contentad_exc_tags').html( '' ); 273 } 274 275 /* add Tag hints to the Exlude tags textarea */ 276 if($('#post-' + wp_wid).attr('data-suggest') !== 'true') { 277 $('.contentad_exc_tags').focus(function(){ 278 $('#edit-' + wp_wid + ' .contentad_exc_tags').suggest("/wp-admin/admin-ajax.php?action=ajax-tag-search&tax=post_tag", {multiple:true, multipleSep: ","}); 279 }); 280 $('#post-' + wp_wid).attr('data-suggest','true'); 273 281 } 274 282 } -
contentad/trunk/readme.txt
r1494857 r1546829 3 3 Tags: related content, engagement, ads, advertising, revenue, posts, montize, monetization, affiliate, contextual ads, contextual advertising, pay per click, ppc, ad networks, relevent ads, text ads, content ads, income, related posts, widgets, related, similar posts, related post thumbnails, popular posts 4 4 Requires at least: 3.0.6 5 Tested up to: 4. 66 Stable tag: 1.1.1 65 Tested up to: 4.7 6 Stable tag: 1.1.17 7 7 License: GPLv2 or later 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 88 88 89 89 == Changelog == 90 91 = 1.1.17 = 92 * You can now add new WordPress Tags using "Content.ad > Widgets > Placement > Exclude widget from tags" 93 * Updated placement labels to include "widget" for clarity 90 94 91 95 = 1.1.16 = -
contentad/trunk/wp-package.json
r1494857 r1546829 5 5 "readme_description": "Display popular content to your users from your own site and/or from our sponsored partners, increasing visitor engagement and earning revenue at the same time.", 6 6 "plugin_description": "Content.ad enables blog owners to display ads or related blog posts (from their own blog) in a \"lead me to more content\" section. The ads are sourced dynamically from the Content.ad system and can be a source of revenue for the blog owner.", 7 "version": "1.1.1 6",7 "version": "1.1.17", 8 8 "url": "https://wordpress.org/plugins/contentad/", 9 9 "copyright": "Copyright 2014 Content.ad (info@content.ad)", 10 10 "requires_wp": "3.0.6", 11 "tested_with": "4. 6",11 "tested_with": "4.7", 12 12 "requires_php": "5.2.4", 13 13 "text_domain": "contentad",
Note: See TracChangeset
for help on using the changeset viewer.