Changeset 432623
- Timestamp:
- 09/03/2011 12:31:43 AM (14 years ago)
- Location:
- feed-nu/trunk
- Files:
-
- 2 added
- 10 edited
-
contents/android.php (modified) (2 diffs)
-
contents/live_settings.php (modified) (3 diffs)
-
contents/request_live_password.php (added)
-
contents/settings.php (modified) (1 diff)
-
contents/tpl.php (modified) (2 diffs)
-
contents/your_apps.php (modified) (1 diff)
-
css/feed_nu.css (modified) (1 diff)
-
feed-api.php (modified) (2 diffs)
-
feed-nu.php (modified) (10 diffs)
-
images/question.png (added)
-
js/main.js (modified) (5 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
feed-nu/trunk/contents/android.php
r420997 r432623 179 179 $this->add_div('home', __('About:'), $guiInput['menu_about']), 180 180 $this->add_div('home', __('About text:'), $guiTextarea['about_text']), 181 $this->add_div('home', __('Button normal:'), $guiFile['mybtn_normal']),182 $this->add_div('home', __('Button focus:'), $guiFile['mybtn_focus']),183 $this->add_div('home', __('Button pressed:'), $guiFile['mybtn_pressed']),181 $this->add_div('home', '<a href="http://draw9patch.com" class="tooltip" target="_blank">?<span>It\'s important to upload a valid nine patch image, click on this link to get help generating one</span></a>'.__('Button normal:'), $guiFile['mybtn_normal']), 182 $this->add_div('home', '<a href="http://draw9patch.com" class="tooltip" target="_blank">?<span>It\'s important to upload a valid nine patch image, click on this link to get help generating one</span></a>'.__('Button focus:'), $guiFile['mybtn_focus']), 183 $this->add_div('home', '<a href="http://draw9patch.com" class="tooltip" target="_blank">?<span>It\'s important to upload a valid nine patch image, click on this link to get help generating one</span></a>'.__('Button pressed:'), $guiFile['mybtn_pressed']), 184 184 185 185 $this->add_div('article', __('Article image:'), $guiFile['top_image_listview']), … … 213 213 <input type=hidden value=feed_cmd name=action> 214 214 <input type=hidden value=save_android_gui name=feed_cmd> 215 <input type=hidden value=0 name=valid_by_canvas> 215 216 <input type=submit value=Save class=button-primary style="float:right"> 216 217 </div> -
feed-nu/trunk/contents/live_settings.php
r418970 r432623 1 1 <h2>Live settings</h2> 2 <p><?php _e("Th is is settings that can be updated without having to regenerate a newapp.", "feed"); ?></p>3 <p><?php _e(" But first you have to enter the password that was sent to your email after you have stared the app for the first time.", "feed"); ?></p>2 <p><?php _e("These are settings you can update without needing to regenerate the app.", "feed"); ?></p> 3 <p><?php _e(" Your password will be e-mailed to you after you use the app for the first time (beta or published).", "feed"); ?></p> 4 4 <hr> 5 5 … … 14 14 15 15 <div class=is_logged_in style="display: none;"> 16 <?php17 /*18 <h4><?php _e("Update published app", "feed"); ?></h4>19 <input type=radio name="update_apps" value="1" checked="checked"> <?php _e("Yes", "feed"); ?><br>20 <input type=radio name="update_apps" value="0"> <?php _e("No", "feed"); ?><br>21 */22 ?>23 16 <h4><?php _e("Disable ads", "feed"); ?><br><small><?php _e("if enable ads some of feed.nu's own ads will be displayed", "feed"); ?></small> </h4> 24 17 <input type=radio name="disableAds" value="true"> <?php _e("Yes", "feed"); ?><br> … … 39 32 </div> 40 33 </form> 41 42 34 <br> 43 <br> 44 <br> 45 35 <a href="#request_live_password">Request new password</a> -
feed-nu/trunk/contents/settings.php
r419469 r432623 20 20 $this->add_field($androidGeneral, 'view_after_loading', 'show the loading page or the welcome screen'), 21 21 $this->add_field($androidGeneral, 'packagename', 'Advance - packagename'), 22 '<h1 style="background: #ddd; padding: 5px;">iOS</h1>', 23 'something<br><br><br>', 22 '<br><br>', 24 23 '<input type=hidden name=action value=feed_cmd>', 25 24 '<input type=hidden name=feed_cmd value=save_general>', -
feed-nu/trunk/contents/tpl.php
r428993 r432623 2 2 <header id=feed_header> 3 3 <a href="http://feed.nu" class="feed_sprite feed_logo">Feed.nu</a> 4 <p>Feed.nu 1.1.1 4</p>4 <p>Feed.nu 1.1.15</p> 5 5 </header> 6 6 … … 12 12 13 13 <nav id=feed_left_nav> 14 <a href=#activity class=active>News</a>15 <a href=#your_apps>Your apps</a>16 <a href=#settings>Settings</a>17 <a href=#android>Android</a>18 <a href=#ios>iOS</a>19 <a href=#live_settings>Live settings</a>14 <a class="feed_activity" href=#activity class=active>News</a> 15 <a class="feed_your_apps" href=#your_apps>Your apps</a> 16 <a class="feed_settings" href=#settings>Settings</a> 17 <a class="feed_android" href=#android>Android</a> 18 <a class="feed_ios" href=#ios>iOS</a> 19 <a class="feed_live_settings" href=#live_settings>Live settings</a> 20 20 </nav> 21 21 -
feed-nu/trunk/contents/your_apps.php
r429796 r432623 67 67 <fieldset style="float: right"> 68 68 <legend>iOS</legend> 69 <p>This will be available verry soon</p>69 <p>This will very soon be avalible for creation</p> 70 70 <input type="hidden" value="feed_cmd" name="action"> 71 71 <input type="hidden" value="handle_apk" name="feed_cmd"> -
feed-nu/trunk/css/feed_nu.css
r419678 r432623 667 667 } 668 668 669 .tooltip 670 { 671 position: relative; 672 display: inline-block; 673 text-decoration: none; 674 outline: none; 675 float:left; 676 } 677 678 .tooltip span 679 { 680 visibility: hidden; 681 position: absolute; 682 bottom: 30px; 683 left: 50%; 684 z-index: 999; 685 width: 230px; 686 margin-left: -127px; 687 padding: 10px; 688 border: 2px solid #ccc; 689 opacity: .9; 690 background-color: #ddd; 691 background-image: -webkit-linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); 692 background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); 693 background-image: -ms-linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); 694 background-image: -o-linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); 695 background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); 696 -moz-border-radius: 4px; 697 border-radius: 4px; 698 -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4), 0 1px 0 rgba(255,255,255,.5) inset; 699 -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4), 0 1px 0 rgba(255,255,255,.5) inset; 700 box-shadow: 0 1px 2px rgba(0,0,0,.4), 0 1px 0 rgba(255,255,255,.5) inset; 701 text-shadow: 0 1px 0 rgba(255,255,255,.4); 702 text-align: left !important; 703 } 704 705 .tooltip:hover 706 { 707 border: 0; /* IE6 fix */ 708 } 709 710 .tooltip:hover span 711 { 712 visibility: visible; 713 } 714 715 716 669 717 .feed_blockMessage{ 670 718 display: none; -
feed-nu/trunk/feed-api.php
r418981 r432623 122 122 return $this->client->getResponse(); 123 123 } 124 125 public function get_api_key($username, $password, $blog_id, $rss_url) {126 return $this->custom_query('feed.getapikey', array('username'=>$username,'password'=>$password,'blog_id'=>$blog_id,'rss_url'=>$rss_url));127 }128 124 public function get_connection_status($apikey) { 129 125 return $this->custom_query('feed.getconnectionstatus',$apikey); … … 140 136 public function feed_get_app_settings($adminemail, $password, $packagename) { 141 137 return $this->custom_query('feed.getappsettings', array('adminemail'=>$adminemail,'password'=>$password,'packagename'=>$packagename)); 138 } 139 public function request_new_live_password($adminemail, $packagename) { 140 return $this->custom_query('feed.requestnewlivepassword', array('adminemail'=>$adminemail,'packagename'=>$packagename)); 142 141 } 143 142 public function feed_set_app_settings( -
feed-nu/trunk/feed-nu.php
r429792 r432623 6 6 Author: Feed.nu 7 7 Author URI: http://feed.nu/ 8 Version: 1.1.1 48 Version: 1.1.15 9 9 License: GPLv2 or later 10 10 */ … … 13 13 /* AVOID DIRECT CALLS 14 14 * 15 * avoid direct calls to this file where16 * wp core files not present17 ************************************************************/15 * avoid direct calls to this file where 16 * wp core files not present 17 ************************************************************/ 18 18 if(!defined('ABSPATH')) 19 19 die('Please do not load this file directly.'); 20 21 20 22 21 … … 192 191 /** 193 192 * Includes some css and javascript when visiting the plugin 194 * @193 * 195 194 * @since 1.1 196 195 ************************************************************/ … … 199 198 wp_enqueue_style('feed_nu_sprite', WP_PLUGIN_URL . '/feed-nu/css/sprite.css'); 200 199 wp_enqueue_style('feed_nu_style', WP_PLUGIN_URL . '/feed-nu/css/feed_nu.css'); 201 // wp_enqueue_style('farbtastic');202 200 wp_enqueue_style('feed_nu_color_style', WP_PLUGIN_URL . '/feed-nu/css/colorpicker.css'); 203 201 wp_enqueue_script('feed_nu_form', WP_PLUGIN_URL . '/feed-nu/js/jquery.form-2.8.0.js'); 204 //wp_enqueue_script('feed_nu_block', WP_PLUGIN_URL . '/feed-nu/js/jquery.block-2.3.9.js');205 wp_enqueue_script('farbtastic');206 202 wp_enqueue_script('feed_nu_color_handler', WP_PLUGIN_URL . '/feed-nu/js/colorpicker.js'); 207 203 wp_enqueue_script('feed_nu_hashchange', WP_PLUGIN_URL . '/feed-nu/js/jquery.hashchange-1.3.min.js'); … … 233 229 234 230 //TODO better way to scan all files name in that folder 235 $whitelist = explode(" ", "activity your_apps settings ios android donate changelog live_settings ");231 $whitelist = explode(" ", "activity your_apps settings ios android donate changelog live_settings request_live_password"); 236 232 237 233 // Include the page requested if whitelisted and file exist … … 275 271 $field = $field[$id]; 276 272 $desc = (isset($field['Description']) && $field['Description']) ? '<br><small>'.$field['Description'].'</small>' : ''; 277 $html = "< h4>$h4 $desc</h4>";273 $html = "<div class='feed_$id'><h4>$h4 $desc</h4>"; 278 274 $standard = (isset($field['Standard'])) ? $field['Standard'] : ''; 279 275 $userValue = (isset($field['UserValue'])) ? $field['UserValue'] : $field['Standard']; … … 298 294 $html .= "<input type=$type name=$id placeholder='$standard' value='$userValue'>"; 299 295 } 300 return $html ;296 return $html."</div>"; 301 297 } 302 298 … … 368 364 } 369 365 366 $validByCanvas = ($_POST["valid_by_canvas"] = "1"); 367 370 368 // Put all new Image settings to $newSettings unless the value is not the standard value or empty 371 369 foreach ($allSettings['Android']['Image'] as $name => $value) { … … 576 574 * Tells feed.nu to generate a apk file 577 575 * 578 * @since 1.1 576 * @since 1.1.15 579 577 ************************************************************/ 580 578 private function generate_apk() { … … 611 609 ); 612 610 611 // Pro settings 612 $mySettings = apply_filters('feed_pro_generation', $mySettings); 613 614 613 615 // Save the time we did generate it 614 616 $this->set_pending_build('Android', $time); -
feed-nu/trunk/js/main.js
r420044 r432623 2 2 jQuery(document).ready(function($){ 3 3 4 if(!location.hash){ 5 location.hash = $('#feed_left_nav a:visible:first').attr('href').replace( /^#/, '' ); 6 } 7 4 8 String.prototype.format = function() { 5 9 var args = arguments; … … 21 25 // hash and adds the class "selected" to any matching nav link. 22 26 $(window).hashchange( function(){ 23 var fallbackHash = $('#feed_left_nav a: first').attr('href');27 var fallbackHash = $('#feed_left_nav a:visible:first').attr('href'); 24 28 var hash = ( location.hash.replace( /^#/, '' ) || fallbackHash.replace( /^#/, '' ) ); 25 29 … … 52 56 //necessary if spaming all links 53 57 if(!fallbackHash){ 54 var fallbackHash = $('#feed_left_nav a: first').attr('href');58 var fallbackHash = $('#feed_left_nav a:visible:first').attr('href'); 55 59 } 56 60 var activeHash = ( location.hash.replace( /^#/, '' ) || fallbackHash.replace( /^#/, '' ) ); … … 216 220 var activeScreen = $('#feed_ios .feed_screen div:visible:first'); 217 221 $('#feed_ios .feed_prev').click(function(){ 218 console.log('s');222 219 223 if(activeScreen.prev().prev().length == 0) 220 224 $(this).attr('disabled', true); … … 295 299 var activeScreen = $('#feed_android .feed_screen div:visible:first'); 296 300 $('#feed_android .feed_prev').click(function(){ 297 console.log('s');301 298 302 if(activeScreen.prev().prev().length == 0) 299 303 $(this).attr('disabled', true); -
feed-nu/trunk/readme.txt
r428993 r432623 5 5 Requires at least: 2.9.2 6 6 Tested up to: 3.2.1 7 Stable tag: 1.1.1 47 Stable tag: 1.1.15 8 8 9 9 Create a native Android app of your blog. … … 39 39 40 40 == Changelog == 41 42 = 1.1.15 = 43 * You are now able to reset the Live Password 44 * correct spellings 45 * Added a link to http://drawninepatch.com/ when uploading 9-grid-button 46 47 = 1.1.14 = 48 * Now able to resend the live password to admin email again 41 49 42 50 = 1.1.14 =
Note: See TracChangeset
for help on using the changeset viewer.