remove features page

app/controllers/pages_controller.rb

@@ -8,10 +8,6 @@ class PagesController < ApplicationController
 
   def social_home; ; end
 
-  def features
-    @menu = 'features'
-  end
-
   def about
     @menu = 'about'
   end

app/views/pages/features.html.erb

@@ -1,22 +0,0 @@
-<h3><%= t(:features) %></h3>
-
-<div class="section_header_reverse">All-purpose Data Storage and Retrieval</div>
-<p>You use ThingSpeak to <em>Send</em> and <em>Receive</em> &quot;data&quot; via simple HTTP requests, much like going to a web page and filling out a form.  Data can be from anything -- <em>Blood Sugar Levels</em> measured by a glucose meter, <em>Server Usage and Uptime</em> reported by servers, or <em>Location Info</em> from a mobile phone. Once the data is in ThingSpeak, you can build applications that retrieve the data, use the data for process decision making, and reporting.</p>
-<p>Data is stored in a ThingSpeak Channel. Each  channel allows you to store up to 8 fields of data up to 255 alphanumeric characters; 4 dedicated location fields for <em>Location Description</em>, <em>Latitude</em>, <em>Longitude</em>, and <em>Elevation</em>; Status Update to augment the data; and a Time Date Stamp to time code each piece of incoming data.</p>
-<div class="section_header_reverse">Data Importing</div>
-<p>Do you already have a bunch of data collected from data acquisition devices, server logs, or sensors? Then you can use the ThingSpeak Importer to bring in your existing data and leverage the ThingSpeak API and Charts to share with and connect to applications instantly.</p>
-<div class="section_header_reverse">Dynamic Charting</div>
-<p>When you need to visualize your data, ThingSpeak has dynamic charts and an API to make customizations. The charts are perfect for displaying sensor data  over time and finding some meaning behind the data. ThingSpeak Charts work on all desktop browsers, iPhones, and Android devices by using JavaScript instead of Flash. The chart types supported are <em>Line</em>, <em>Bar</em>, <em>Column</em>, and <em>Step</em>. You can set colors, sizing, and labels to allow the charts to fit perfectly into your web page or web application.</p>
-<div class="section_header_reverse">Data Processing</div>
-<p>When pulling data out of ThingSpeak, you can process the data to get it ready for your application. You can also filter the data by setting minimum and maximum value thresholds. Processing options include time scaling, summing, averaging, and median.</p>
-<div class="section_header_reverse">Integration with Twitter</div>
-<p>Often enough you will find times where you want to share significant data across social networks like Twitter. You can have your garage door Tweet,
-  &quot;You left your garage door open&quot; or have your house, say &quot;Today's Power Use was 6150 watts.&quot; The ThingSpeak API has Twitter baked in, so you can send status updates to Twitter along with storing your data in a ThingSpeak Channel at the same time.          </p>
-<div class="section_header_reverse">Fully Localized</div>
-<p>ThingSpeak supports over 40 time zones and time offsets for locations that support Day Light Savings. When charts and data are presented to users, we format times and dates using  the viewer's time zone. The user interface for ThingSpeak currently supports English and Brazilian Portuguese languages automatically, but the localization <a href="https://github.com/iobridge/thingspeak/blob/master/config/locales/en.yml" title="GitHub Localization file for ThingSpeak.">file</a> is available for translation into other languages. ThingSpeak numerical data  supports commas used as decimals, for example, it's getting 38,2 degrees in here, for our friends in Brazil and many other <a href="http://en.wikipedia.org/wiki/Decimal_mark#Countries_using_Arabic_numerals_with_decimal_comma" title="Countries using Arabic numerals with decimal comma" target="_blank">countries</a>.</p>
-<div class="section_header_reverse">Privacy Options for  Open Data</div>
-<p>We respect your privacy. You can choose to make your data public or private. Over 95% of ThingSpeak Channels are private meaning that the data is not publicly accessible without API keys and user authentication. You can control who has access to your data and build applications that are open to those that you choose. We don't sell your data to third-parties. You can even run ThingSpeak on a private network at your facility or home and build tightly secured applications for your organization's needs.</p>
-<div class="section_header_reverse">Open Source for Open Source</div>
-<p>The ThingSpeak API is available on <a href="https://github.com/iobridge/thingspeak" title="GitHub repo for ThingSpeak source code" target="_blank">GitHub</a> for download and installation on your own servers. You can also take the source code and make changes and contribute new features. ThingSpeak is a modern Ruby on Rails 3.0 application and includes everything to get started including, a full web application, <em>User Management</em>, <em>API Key Management</em>,  <em>Channel Management</em>, and <em>Charting</em>. The license for ThingSpeak is under GPLv3 for open source use and can be licensed from <a href="http://www.iobridge.com" title="ioBridge" target="_blank">ioBridge</a> for closed source applications. ThingSpeak has been installed on over 500 servers and licenced commercially since its release on GitHub in March 2011. <a href="http://connect.iobridge.com/contact/" target="_blank" title="Contact ioBridge for licensing options for ThingSpeak">Contact ioBridge</a> for licensing options for commercial use.</p>
-<p align="center"><a href="https://github.com/iobridge/thingspeak" target="_blank"><%= image_tag 'GitHub_ThingSpeak_API.jpg', :size => '300x288' %></a></p>
-

config/locales/en.yml

@@ -319,6 +319,7 @@ en:
   talkback_name: "Name"
   talkback_new_api_key: "Regenerate API Key"
   talkback_permission: "This TalkBack doesn't belong to you."
+  talkback_required: "You need to add a TalkBack"
   thinghttp: "ThingHTTP"
   thinghttp_auth_name: "HTTP Auth Username"
   thinghttp_auth_pass: "HTTP Auth Password"
@@ -347,6 +348,9 @@ en:
   thingtweet_back: "Back to ThingTweet"
   timecontrol: "TimeControl"
   timecontrols: "TimeControls"
+  timecontrol_action_talkback_command: "then add command"
+  timecontrol_action_talkback_command_position: "at position"
+  timecontrol_action_talkback_prefix: "to TalkBack"
   timecontrol_date: 'date'
   timecontrol_days: 'days'
   timecontrol_delete_message: "Want to delete this TimeControl?"
@@ -356,8 +360,10 @@ en:
   timecontrol_permission: "You don't have permission to view that TimeControl!"
   timecontrol_run_at: 'run at'
   timecontrol_time: 'time'
+  timecontrol_talkback_delete_warning1: "Cannot delete this TalkBack as it is used by %{timecontrols_count}: %{timecontrols_list}"
+  timecontrol_talkback_delete_warning2: "Please delete or modify this TimeControl before unlinking this TalkBack."
   timecontrol_twitter_delete_warning1: "Cannot delete this Twitter account as it is used by %{timecontrols_count}: %{timecontrols_list}"
-  timecontrol_twitter_delete_warning2: "Please delete or modify this TimeConrol before unlinking this Twitter account."
+  timecontrol_twitter_delete_warning2: "Please delete or modify this TimeControl before unlinking this Twitter account."
   timecontrol_thinghttp_delete_warning1: "Cannot delete this ThingHTTP as it is used by %{timecontrols_count}: %{timecontrols_list}"
   timecontrol_thinghttp_delete_warning2: "Please delete or modify this TimeControl before unlinking this ThingHTTP."
   timescale: "Timescale"
@@ -452,7 +458,7 @@ en:
   help_thinghttp_example: "This will send your HTTP GET request to Google Finance and parse the response for an element having an ID of ref_626307_c, which corresponds to the S&P 500 current price change for the day."
   help_thinghttp_show: "You can now send your ThingHTTP request and view the response using the following URL:"
   help_thingtweet: "ThingTweet acts as a proxy to Twitter so that your devices can update Twitter statuses without having to implement Open Authentication (OAuth)."
-  help_timecontrol_index: "Create a TimeControl to automatically execute ThingHTTP or ThingTweet requests at predetermined times."
+  help_timecontrol_index: "Create a TimeControl to automatically execute ThingHTTP requests, udpate ThingTweet statuses, or add TalkBack commands at predetermined times."
   help_timecontrol_show: "Your TimeControl will be automatically executed at the indicated time."
   help_tweetcontrol: "Use TweetControl to listen to specific trigger words from Twitter, and then process a ThingHTTP request."
   help_tweetcontrol_edit: "Select Anonymous TweetControl to allow anyone to trigger your TweetControl or fill in a specfic Twitter Account (don't include the '@' sign)."

config/routes.rb

@@ -24,7 +24,6 @@ Thingspeak::Application.routes.draw do
   resource :pages do
     collection do
       get :home
-      get :features
       get :about
       get :headers
       get :social_home