Changeset 546334
- Timestamp:
- 05/19/2012 09:43:25 PM (14 years ago)
- Location:
- emc2-popup-disclaimer/trunk
- Files:
-
- 8 edited
-
emc2pdc-admin.php (modified) (6 diffs)
-
emc2pdc.css (modified) (1 diff)
-
fancybox/_notes/dwsync.xml (modified) (1 diff)
-
fancybox/example/_notes/dwsync.xml (modified) (1 diff)
-
fancybox/fancybox/_notes/dwsync.xml (modified) (1 diff)
-
fancybox/fancybox/jquery.fancybox-1.3.4.css (modified) (2 diffs)
-
js/_notes/dwsync.xml (modified) (1 diff)
-
js/emc2pdc.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
emc2-popup-disclaimer/trunk/emc2pdc-admin.php
r546274 r546334 31 31 // Begin Output! 32 32 echo '<h1>EMC2 Popup Disclaimer</h1><h2><em style="color:#666;">Settings Page</em></h2><br />'; 33 echo '<div id="iframe"><h4>It would mean a lot to me if you could rate this plugin!</h4> 34 <iframe src="http://wordpress.org/extend/plugins/emc2-popup-disclaimer#plugin-title" frameborder="1" width="auto" height="200" scrolling="auto"> 35 <a href="http://wordpress.org/extend/plugins/emc2-popup-disclaimer" target="_blank">http://wordpress.org/extend/plugins/emc2-popup-disclaimer</a> 36 </iframe></div>'; 37 33 38 // display plugin options 34 39 … … 42 47 43 48 <fieldset> 44 <label for="nid">Page or post nid to display in popup:</label>49 <label class="block" for="nid">Page or post nid to display in popup:</label> 45 50 <input type="text" name="nid" width="30" value="<?php echo $settings['nid']; ?>" /> 46 51 <a class="button" onclick="findPosts.open('action','find_posts');return false;" href="#"><?php esc_attr_e('Post Search'); ?></a> … … 48 53 </fieldset> 49 54 <fieldset> 50 <label for="cexpire">Number of days to hold cookies for (0 to disable):</label>55 <label class="medium" for="cexpire">Number of days to hold cookies for (0 to disable):</label> 51 56 <input type="text" name="cexpire" width="30" value="<?php echo $settings['cexpire']; ?>" /> 52 57 </fieldset> 53 58 <fieldset> 54 <label for="accept_text">'Accept' button text:</label>59 <label class="medium" for="accept_text">'Accept' button text:</label> 55 60 <input type="text" name="accept_text" width="50" value="<?php echo $settings['accept_text']; ?>" /> 56 61 </fieldset> 57 62 <fieldset> 58 <label for="decline_text">'Decline' button text:</label>63 <label class="medium" for="decline_text">'Decline' button text:</label> 59 64 <input type="text" name="decline_text" width="50" value="<?php echo $settings['decline_text']; ?>" /> 60 65 </fieldset> 61 66 <fieldset> 62 <label for="redirect_url">'Decline' redirection url:</label>67 <label class="medium" for="redirect_url">'Decline' redirection url:</label> 63 68 <input type="text" name="redirect_url" width="50" value="<?php echo $settings['redirect_url']; ?>" /> 64 69 </fieldset> … … 93 98 94 99 100 /* **************************************************************** 101 ** 102 ** function emc2pdc_shortcode( $atts) 103 ** 104 ** Removes default footer action and adds a force argument 105 ** to the new action. jQuery then picks up on the force 106 ** and displays the popup box regardless of cookie state. 107 ** 108 ** This function can also be used to force the disclaimer popup. 109 ** 110 **************************************************************** */ 111 add_shortcode('emc2pdc', 'emc2pdc_force'); 112 function emc2pdc_force( $atts=array() ){ 113 extract(shortcode_atts(array( 114 'force' => '0', 115 ), $atts)); 116 117 remove_action('wp_footer', 'emc2pdc_disclaimer'); 118 add_action('emc2pdc_footer', 'emc2pdc_disclaimer', 10, 2 ); 119 do_action('emc2pdc_footer', $atts, $force=3); 120 121 } // emc2pdc_shortcode; 95 122 96 123 97 function emc2pdc_disclaimer() { 124 125 /* **************************************************************** 126 ** 127 ** function emc2pdc_disclaimer( $atts, $force) 128 ** 129 ** Working output of popup variables and content. Called from 130 ** emc2-popup-disclaimer.php as well. 131 ** 132 **************************************************************** */ 133 134 function emc2pdc_disclaimer( $atts, $force=NULL) { 135 extract(shortcode_atts(array( 136 //'force' => '0', 137 ), $atts)); 138 98 139 99 140 $settings = unserialize(get_option('emc2pdc_settings')); … … 110 151 echo '<div id="'.$name.'">'.$setting.'</div>'; 111 152 } // foreach $settings 112 echo '</div>'; 153 154 if($force){ echo '<div id="force">1</div>'; } 155 156 echo '</div>'; // #emc2pdc-vars 113 157 114 158 echo '<div id="emc2pdc-trigger"></div>'; … … 120 164 121 165 echo '</div></div>'; 122 123 124 125 126 127 128 166 } -
emc2-popup-disclaimer/trunk/emc2pdc.css
r545277 r546334 64 64 font: bold 12px/25px Arial, sans-serif; 65 65 } 66 #emc2pdc_form .block{ display:block; } 67 #emc2pdc_form .medium{ width:200px; display:inline-block;} 68 69 .settings_page_emc2-popup-disclaimer-emc2pdc-admin #iframe{ float:right; margin-right:20px;} 70 .settings_page_emc2-popup-disclaimer-emc2pdc-admin #iframe iframe{ 71 box-shadow:0 0 6px #555; 72 } -
emc2-popup-disclaimer/trunk/fancybox/_notes/dwsync.xml
r545280 r546334 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name="ajax.txt" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />4 <file name="index.html" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />5 <file name="jquery-1.4.3.min.js" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />6 <file name="style.css" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />3 <file name="ajax.txt" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 4 <file name="index.html" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 5 <file name="jquery-1.4.3.min.js" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 6 <file name="style.css" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 7 7 </dwsync> -
emc2-popup-disclaimer/trunk/fancybox/example/_notes/dwsync.xml
r545280 r546334 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name="10_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />4 <file name="10_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />5 <file name="11_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />6 <file name="11_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />7 <file name="12_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />8 <file name="12_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />9 <file name="1_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />10 <file name="1_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />11 <file name="2_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />12 <file name="2_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />13 <file name="3_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />14 <file name="3_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />15 <file name="4_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />16 <file name="4_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />17 <file name="5_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />18 <file name="5_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />19 <file name="6_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />20 <file name="6_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />21 <file name="7_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />22 <file name="7_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />23 <file name="8_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />24 <file name="8_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />25 <file name="9_b.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />26 <file name="9_s.jpg" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />3 <file name="10_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 4 <file name="10_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 5 <file name="11_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 6 <file name="11_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 7 <file name="12_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 8 <file name="12_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 9 <file name="1_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 10 <file name="1_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 11 <file name="2_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 12 <file name="2_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 13 <file name="3_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 14 <file name="3_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 15 <file name="4_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 16 <file name="4_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 17 <file name="5_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 18 <file name="5_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 19 <file name="6_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 20 <file name="6_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 21 <file name="7_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 22 <file name="7_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 23 <file name="8_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 24 <file name="8_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 25 <file name="9_b.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 26 <file name="9_s.jpg" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 27 27 </dwsync> -
emc2-popup-disclaimer/trunk/fancybox/fancybox/_notes/dwsync.xml
r545280 r546334 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name=" blank.gif" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />4 <file name=" fancy_close.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />5 <file name="fancy_ loading.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />6 <file name="fancy_ nav_left.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />7 <file name="fancy_nav_ right.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />8 <file name="fancy_ shadow_e.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />9 <file name="fancy_shadow_ n.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />10 <file name="fancy_shadow_n e.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />11 <file name="fancy_shadow_n w.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />12 <file name="fancy_shadow_ s.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />13 <file name="fancy_shadow_s e.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />14 <file name="fancy_shadow_s w.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />15 <file name="fancy_shadow_ w.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />16 <file name="fancy_ title_left.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />17 <file name="fancy_title_ main.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />18 <file name="fancy_title_ over.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />19 <file name="fancy_title_ right.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />20 <file name="fancy box-x.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />21 <file name="fancybox- y.png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />22 <file name="fancybox .png" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />23 <file name=" jquery.easing-1.3.pack.js" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />24 <file name="jquery. fancybox-1.3.4.css" server="direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />25 <file name="jquery.fancybox-1.3.4.js" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />26 <file name="jquery.fancybox-1.3.4.pack.js" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />27 <file name="jquery.mousewheel-3.0.4.pack.js" server=" direct.emc2innovation.com" local="129777003000000000" remote="129777003000000000" />3 <file name="jquery.fancybox-1.3.4.css" server="emc2innovation.com" local="129819330600000000" remote="129819330600000000" /> 4 <file name="blank.gif" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 5 <file name="fancy_close.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 6 <file name="fancy_loading.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 7 <file name="fancy_nav_left.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 8 <file name="fancy_nav_right.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 9 <file name="fancy_shadow_e.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 10 <file name="fancy_shadow_n.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 11 <file name="fancy_shadow_ne.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 12 <file name="fancy_shadow_nw.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 13 <file name="fancy_shadow_s.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 14 <file name="fancy_shadow_se.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 15 <file name="fancy_shadow_sw.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 16 <file name="fancy_shadow_w.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 17 <file name="fancy_title_left.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 18 <file name="fancy_title_main.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 19 <file name="fancy_title_over.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 20 <file name="fancy_title_right.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 21 <file name="fancybox-x.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 22 <file name="fancybox-y.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 23 <file name="fancybox.png" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 24 <file name="jquery.easing-1.3.pack.js" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 25 <file name="jquery.fancybox-1.3.4.js" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 26 <file name="jquery.fancybox-1.3.4.pack.js" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 27 <file name="jquery.mousewheel-3.0.4.pack.js" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 28 28 </dwsync> -
emc2-popup-disclaimer/trunk/fancybox/fancybox/jquery.fancybox-1.3.4.css
r545280 r546334 44 44 left: 0; 45 45 width: 100%; 46 z-index: 1100 ;46 z-index: 11000; 47 47 display: none; 48 48 } … … 61 61 left: 0; 62 62 padding: 20px; 63 z-index: 1101 ;63 z-index: 11010; 64 64 outline: none; 65 65 display: none; -
emc2-popup-disclaimer/trunk/js/_notes/dwsync.xml
r545278 r546334 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <dwsync> 3 <file name="emc2pdc.js" server=" direct.emc2innovation.com" local="129777079200000000" remote="129777079200000000" />4 <file name="emc2pdc.css" server=" direct.emc2innovation.com" local="129776983012685546" remote="129777018600000000" />5 <file name="jquery.cookie.js" server=" direct.emc2innovation.com" local="129777061200000000" remote="129777061200000000" />3 <file name="emc2pdc.js" server="emc2innovation.com" local="129819361200000000" remote="129819361200000000" /> 4 <file name="emc2pdc.css" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 5 <file name="jquery.cookie.js" server="emc2innovation.com" local="129819291600000000" remote="129819291600000000" /> 6 6 </dwsync> -
emc2-popup-disclaimer/trunk/js/emc2pdc.js
r545278 r546334 6 6 // Set cookie expiry, default 1 day 7 7 var cexpire = parseInt( $j('#emc2pdc-vars').children('#cexpire').text() ); 8 var force = parseInt( $j('#emc2pdc-vars').children('#force').text() ); 9 console.log( force ); 8 10 if(!cexpire){ cexpire = 1; } 9 11 10 if( $j.cookie('emc2pdc') == 'agreed'){ 12 // If force argument is set, display box regardless of cookie state 13 if( ($j.cookie('emc2pdc') == 'agreed') && (!force) ){ 11 14 // they've already agreed to the disclaimer! 12 15 } else { … … 23 26 'transitionOut': 'fade', 24 27 'content': $j('#emc2pdc-disc-wrap').html(), 25 'onComplete': function(){ Cufon.refresh();}28 'onComplete': function(){ } 26 29 27 30 }).trigger('click');
Note: See TracChangeset
for help on using the changeset viewer.