platform 3.1.2 → 3.1.3

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm 1.9.2@platform --create
+#rvm gemset import | grep -v -E 'already installed|default\.gems|^$'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    platform (3.1.2)
+    platform (3.1.3)
       acts_as_state_machine
       acts_as_tree
       coffee-script
@@ -135,7 +135,7 @@ GEM
     ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     rubyzip (0.9.4)
-    sass (3.1.8)
+    sass (3.1.10)
     selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
@@ -146,14 +146,14 @@ GEM
     sprockets (2.0.2)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     steak (2.0.0)
       capybara (>= 1.0.0)
       rspec-rails (>= 2.5.0)
     thor (0.14.6)
     tilt (1.3.3)
-    tr8n (3.1.2)
+    tr8n (3.1.4)
       coffee-script
       kaminari
       rails (>= 3.1.0)

data/README.rdoc

@@ -31,7 +31,6 @@ Add the following gems to your Gemfile:
   gem 'coffee-script'
   gem 'acts_as_tree'
   gem 'acts_as_state_machine'
-  gem 'rmagick'
 
 And run:
 
@@ -49,7 +48,6 @@ To configure and initialize Platform engine, run the following commands:
   $ rails generate tr8n
   $ rails generate platform
   $ rake db:migrate
-  $ rake tr8n:init
   $ rake platform:init
   $ rails s
 
@@ -65,7 +63,6 @@ The best way to get going with Platform is to run the gem as a stand-alone appli
   $ git clone git://github.com/berk/platform.git
   $ cd platform/test/dummy
   $ rake db:migrate
-  $ rake tr8n:init
   $ rake platform:init
   $ rails s
 

data/app/assets/javascripts/platform/api_explorer.js

@@ -33,7 +33,9 @@ function getAccessToken() {
 	if (land_url.indexOf("http") == -1) {
 		land_url = "http://" + land_url;
 	}
-	var oauth_url = '/platform/oauth/authorize?client_id=' + api_explorer_app_id + '&response_type=token&display=mobile&redirect_url=' + escape(land_url)
+	var app_id = Platform.element("app_id").value;
+	
+	var oauth_url = '/platform/oauth/authorize?client_id=' + app_id + '&response_type=token&display=mobile&redirect_url=' + escape(land_url)
   var win = window.open(oauth_url, 'oauthx_auth', 'width=' + width +',height=' + height + ',top=' + top  + ',left=' + left);
 } 
 
@@ -304,6 +306,7 @@ function addPostField(name, value) {
   var field = document.createElement("div");
   field.id="field" + field_count;
   field.className="field";
+  field.style.padding="0px";
   
   var field_name_container = document.createElement("span");
   field_name_container.className="field_name_container";

data/app/controllers/platform/api/base_controller.rb

@@ -88,10 +88,6 @@ module Platform
         Platform::Config.api_allow_public?
       end
 
-      def ensure_api_enabled
-        raise ServiceUnavailableError.new('API Disabled') unless enabled?
-      end
-
       def client_app
         @client_app ||= access_token.try(:application)
       end
@@ -182,18 +178,7 @@ module Platform
       ############################################################################
       def render_response(obj, opts={})
         to_opts = params.merge(:max_models => limit, :viewer => current_user, :api_version => api_version)
-          
-        if obj.is_a?(Array)
-          if obj.size == 1 and not only_list?
-            obj = obj.first
-          else
-            hash = {'results' => obj.collect{|o| o.to_api_hash(to_opts)}}
-            hash['page']          = page if page > 1 || limit == obj.size
-            hash['previous_page'] = prev_page if page > 1
-            hash['next_page']     = next_page if limit == obj.size
-            obj = hash
-          end
-        end
+        obj = sanitize_results(obj, to_opts) if obj.is_a?(Array)
     
         respond_to do |format|
           format.json   do
@@ -222,6 +207,19 @@ module Platform
         true
       end  
   
+      def sanitize_results(results, opts = {})
+        if results.size == 1 and not only_list?
+          results = results.first
+        else
+          hash = {'results' => results.collect{|o| o.to_api_hash(opts)}}
+          hash['page']          = page if page > 1 || limit == results.size
+          hash['previous_page'] = prev_page if page > 1
+          hash['next_page']     = next_page if limit == results.size
+          results = hash
+        end
+        results
+      end
+  
       def add_response_headers
         return unless enabled?
         return unless rate_limited?
@@ -261,21 +259,34 @@ module Platform
         raise Exception.new("must be implemented in the extanding class")
       end
   
+      def page_results
+        model_class.where(page_model_conditions)
+      end
+
+      def order
+        'id ASC'
+      end
+  
       def page_models
-        @page_models ||= model_class.where(page_model_conditions).limit(limit).offset(offset).order('id ASC').all
+        @page_models ||= page_results.limit(limit).offset(offset).order(order).all
       end
 
       def page_model
-        @page_model ||= model_class.where(page_model_conditions).first || raise(ActiveRecord::RecordNotFound)
+        @page_model ||= page_results.first || raise(ActiveRecord::RecordNotFound)
       end
   
       def page_model_conditions(id_fields=nil)
-        id_fields ||= self.class.id_fields
-        page_ids = ids(id_fields)
         return nil if page_ids.empty?
         {:id => page_ids}
       end
   
+      def page_ids
+        @page_ids ||= begin
+          id_fields ||= self.class.id_fields
+          ids(id_fields)
+        end
+      end
+      
       # default id fields
       def self.id_fields
         [:id, :ids]
@@ -410,6 +421,10 @@ module Platform
       ############################################################################
       #### Ensurance
       ############################################################################
+      def ensure_api_enabled
+        raise ServiceUnavailableError.new('API Disabled') unless enabled?
+      end
+
       def ensure_post
         raise MethodNotAllowedError.new('POST required') unless request.post?
       end
@@ -425,6 +440,10 @@ module Platform
       def ensure_delete
         raise MethodNotAllowedError.new('DELETE required') unless request.delete?
       end
+
+      def ensure_application
+        raise LoginError.new("This API can only be called through an application") unless client_app
+      end
   
       def ensure_logged_in
         raise LoginError.new("You must be logged in to use this API") unless logged_in?

data/app/models/platform/application.rb

@@ -24,8 +24,6 @@
 class Platform::Application < ActiveRecord::Base
   set_table_name :platform_applications
 
-  has_platform_api_proxy
-  
   # useful methods - should be public
   include Platform::SimpleStringPermissions
   acts_as_tree :order => "version"
@@ -312,11 +310,11 @@ class Platform::Application < ActiveRecord::Base
   end
   
   def last_monthly_metric
-    @last_monthly_metric ||= Platform::MonthlyApplicationMetric.find(:first, :conditions => ["application_id = ?", id], :order => "interval desc")
+    @last_monthly_metric ||= Platform::MonthlyApplicationMetric.find(:first, :conditions => ["application_id = ?", id], :order => "'interval' desc")
   end
 
   def last_total_metric
-    @last_total_metric ||= Platform::TotalApplicationMetric.find(:first, :conditions => ["application_id = ?", id], :order => "interval desc")
+    @last_total_metric ||= Platform::TotalApplicationMetric.find(:first, :conditions => ["application_id = ?", id], :order => "'interval' desc")
   end
   
   def recently_updated_reviews

data/app/models/platform/developer.rb

@@ -24,8 +24,6 @@
 class Platform::Developer < ActiveRecord::Base
   set_table_name :platform_developers
 
-  has_platform_api_proxy
-
   belongs_to :user, :class_name => Platform::Config.user_class_name, :foreign_key => :user_id
   
   has_many :applications, :class_name => "Platform::Application"
@@ -44,4 +42,8 @@ class Platform::Developer < ActiveRecord::Base
     dev
   end
   
+  def app_options
+    @app_options ||= applications.collect{|app| [app.name, app.id]}
+  end
+  
 end

data/app/models/platform/logged_exception.rb

@@ -40,8 +40,8 @@ class Platform::LoggedException < ActiveRecord::Base
       :backtrace       => exception.backtrace,
       :session         => controller.request.session,
       :request         => controller.request,
-      :user_id         => Platform::Config.current_user.try(:id),
-      :cause           => exception.try(:cause)
+      :user_id         => Platform::Config.current_user.try(:id)
+      # :cause           => exception.try(:cause)
     )
   rescue StandardError => ex
     pp ex

data/app/models/platform/media/media.rb

@@ -43,9 +43,12 @@ class Platform::Media::Media < ActiveRecord::Base
     
     FileUtils.mkdir_p(local_dir) unless File.exist?(local_dir)
 
-    image = Magick::ImageList.new(file.path)
-    image = image.resize(opts[:size], opts[:size]) if opts[:size]
-    image.write(local_path)
+    # you could force resize the image, but not the job of this plugin
+    # image = Magick::ImageList.new(file.path)
+    # image = image.resize(opts[:size], opts[:size]) if opts[:size]
+    # image.write(local_path)
+    
+    FileUtils.cp(file.path, local_path)
     FileUtils.chmod(0644, local_path)
 
     save

data/app/views/platform/admin/apps/index.html.erb

@@ -3,7 +3,7 @@
 
 <%= will_filter_tag(@apps) %>
 <%= will_filter_table_tag(@apps, :columns => [
-  [:icon, lambda{|app| link_to(image_tag(app.icon_url), :action => :view, :app_id => app.id)}, "width:18px;"],  
+  [:icon, lambda{|app| link_to(image_tag(app.icon_url, :style=>"width:15px; height:15px;"), :action => :view, :app_id => app.id)}, "width:18px;"],  
   [:id, lambda{|app| link_to(app.id, :action => :view, :app_id => app.id)}],
   [:developer_id, lambda{|app| link_to(app.developer.name, "") if app.developer}],
   :name,

data/app/views/platform/apps/index.html.erb

@@ -2,7 +2,7 @@
 
 <div class="module page_title lengthy">
   <div class="inner">
-    <div class="hd">
+    <div class="hd" style="margin-bottom:20px;">
       <span style="float:right; padding-top:15px; font-size:12px;">
 			   <%=tr("Have an idea for an app?")%>
 			   <% if platform_current_user_is_developer? %>
@@ -12,7 +12,7 @@
 				 <% end %>
       </span>
     	
-      <h1><%= tr('Application Directory', 'Client application section title') %></h1>
+      <div style="font-size:28px;color:#666;"><%= tr('Application Directory', 'Client application section title') %></div>
     </div>
   </div>
 </div>

data/app/views/platform/developer/api_explorer/index.html.erb

@@ -10,13 +10,17 @@
 </div>
 
 <div class="section">
-	<% if Platform::Config.api_explorer_app? %>
+ 	 <% if (platform_current_developer and platform_current_developer.app_options.any?) or Platform::Config.api_explorer_app %>
 	  <div class="section grey" style="margin-top:5px;margin-bottom:0px;">
 			<table style="width:100%">
 				<tr>
-					<td style="width:100px; vertical-align:middle"><%=tr("Access Token:")%></td>
+					<% if platform_current_developer and platform_current_developer.app_options.any? %>
+						<td style="width:200px; vertical-align:middle"><%=select_tag("app_id", options_for_select(platform_current_developer.app_options, params[:app_id]), :style=>"width:95%")%></td>
+					<% else %>
+						<td style="width:1px;"><%=hidden_field_tag("app_id", Platform::Config.api_explorer_app_id)%></td>
+					<% end %>
 					<td style="vertical-align:middle">
-						 <%=text_field_tag(:access_token, "", :style=>"width:600px;")%> &nbsp;
+						 <%=text_field_tag(:access_token, "", :style=>"width:95%;", :placeholder => "Paste an access token or click on the button to the right to generate one")%> &nbsp;
 					   <%=link_to_function("X", "Platform.element('access_token').value = '';")%> 
 					</td>
 					<td style="width:150px; text-align:right;">
@@ -39,9 +43,9 @@
 				  <%=select_tag("request_method", options_for_select(['GET', 'POST', 'PUT', 'DELETE'], params[:method] || 'GET'), :style=>"", :onChange=>"switchRequestMethod()")%>
   			</td>
 				<td>
-					<table style="border:1px solid #ccc;padding:0px;margin:0px;font-size:12px;color:#888;vertical-align:middle; background-color:white;height:23px;">
+					<table cellspacing="0" cellpadding="0" style="border:1px solid #ccc;padding:0px;margin:0px;font-size:12px;vertical-align:middle; background-color:white;height:23px;">
 						<tr>
-							<td><span style="padding-left:5px;vertical-align:middle;white-space:nowrap;">http://<%=Platform::Config.api_base_url%>/</span></td>
+							<td style="background-color:#eee;"><span style="padding-left:5px;vertical-align:middle;white-space:nowrap;padding-right:0px;">http://<%=Platform::Config.api_base_url%>/</span></td>
 							<td><%=text_field_tag(:api_path, params[:path], :style=>"width:500px;border:0px;padding:0px;margin:0px;font-size:12px;vertical-align:middle;", :onKeyUp=>"if (event.keyCode == 13) {api_history_index=-1; submitRequest();}")%></td>
 							<td><span style="float:right;padding-right:5px;"><%=link_to_function(image_tag("platform/arrow_down.gif"), "toggleApiOptions(this)")%></span></td>
 						</tr>	

data/app/views/platform/developer/apps/_form.html.erb

@@ -60,7 +60,8 @@
 	    	<span style="float:right; font-size:10px;">
 	    		<%=link_to_function(tr("Change your icon", 'Client application field action'), "Platform.Effects.hide('icon_preview');Platform.Effects.show('icon_field');")%>
 	    	</span>
-	      <%=image_tag(@app.icon_url, :style => "width:16px;height:16px;")%>
+
+				<%=platform_app_icon_tag(@app) %>
 			</div>	
     </td> 
     <td class="comments">
@@ -80,7 +81,8 @@
 	      <span style="float:right; font-size:10px;">
 	        <%=link_to_function(tr("Change your logo", 'Client application field action'), "Platform.Effects.hide('logo_preview');Platform.Effects.show('logo_field');")%>
 	      </span>
-	      <%=image_tag(@app.logo_url, :style => "width:75px;height:75px;")%>
+
+				<%=platform_app_logo_tag(@app) %>
 			</div>
     </td> 
     <td class="comments">

data/app/views/platform/developer/apps/index.html.erb

@@ -85,7 +85,8 @@
           <% @apps.each do |app| %>
             <% if app == @menu_app %>
                 <div class="<%= (@app != @menu_app) ? 'app_item' : 'app_selected' %>">
-                  <%=image_tag(app.icon_url, :style => "vertical-align:middle;")%> &nbsp;
+									<%=platform_app_icon_tag(app, :style => "vertical-align:middle;") %>
+									&nbsp;
                   <%=link_to(app.name, {:id=>app.id}) %>
                 </div>  
 		            <% app.children.each do |app| %>
@@ -96,7 +97,8 @@
 		            <% end %>
             <% else %>
                 <div class="app_item">    
-			            <%=image_tag(app.icon_url, :style => "vertical-align:middle;")%> &nbsp;
+									<%=platform_app_icon_tag(app, :style => "vertical-align:middle;") %>
+									&nbsp;
 			            <%=link_to(app.name, {:id=>app.id}) %>
 								</div>	
             <% end %>
@@ -108,7 +110,7 @@
             <table>
               <tr>
                 <td style="align-vertical:top; width:90px;" rowspan="2">
-                   <%=image_tag(@app.logo_url)%> 
+ 									<%=platform_app_logo_tag(@app) %>
                 </td>
                 <td style="align-vertical:top;">
 			            <div style="float:right;">
@@ -137,7 +139,7 @@
 												 </div>
                       <% else %>
                          <span style='color:red'>not submitted</span>
-                         <div style="font-size:11px;color:#999;"><%=tr("Once you have completed your application, you may submit it to the [link: App Directory].", "", :link => ["/platform/apps"])%></div>
+                         <div style="font-size:11px;color:#999;"><%=tr("Once you have completed your application, you may submit it to the [link: App Directory].", "", :link => {:href=>"/platform/apps"})%></div>
                       <% end %>  
                     </div>
                   <% end -%> 

data/app/views/platform/developer/common/_header.html.erb

@@ -3,7 +3,6 @@
 <% if platform_developer_tabs.size > 1 %>
 	<div class="translations_navigation" dir="ltr">
 	  <div style="font-size:22px; font-weight: bold;padding-bottom:15px;">
-			<%=Platform::Config.site_title%>
 		  <%=tr("Platform Developer Tools", "Platform developer tools label")%>
 		</div>
 	

data/app/views/platform/developer/dashboard/_statistics.html.erb

@@ -18,7 +18,7 @@
   new_users_data = []
   active_users_data = []
   while start_date <= end_date do
-    metric = Platform::DailyApplicationMetric.find(:first, :conditions => ["application_id = ? and interval = ?", app.id, start_date])
+    metric = Platform::DailyApplicationMetric.where("application_id = ? and 'interval' = ?", app.id, start_date).first
     new_user_count = metric ? metric.new_user_count : 0
     active_user_count = metric ? metric.active_user_count : 0
     new_users_data << [start_date.strftime("%m/%d"), new_user_count]   

data/app/views/platform/developer/dashboard/index.html.erb

@@ -67,7 +67,7 @@
 
     <%=platform_toggler_tag("app_content_#{app.id}")%>
     
-    <%=image_tag(app.icon_url, :title=>app.name) %>&nbsp;
+    <%=image_tag(app.icon_url, :title=>app.name, :style=>"width:16px;height:16px;") %>&nbsp;
     <a name="app_<%=app.id%>" style="text-decoration:none;color:black;"><%=app.versioned_name%></a>
   </div>
   

data/app/views/platform/developer/help/oauth_mobile.html.erb

@@ -97,7 +97,8 @@
     </p>
     <h3><%=tr("Example")%></h3>
     <div class="code_snippet">
-        https://<%=Platform::Config.site_base_url %>/platform/oauth/authorize?client_id=YOUR_APP_ID&redirect_uri=YOUR_APP_URL&response_type=token&display=mobile
+        https://<%=Platform::Config.site_base_url %>/platform/oauth/authorize?client_id=YOUR_APP_ID&
+redirect_uri=YOUR_APP_URL&response_type=token&display=mobile
     </div>
     <p>
     	<%=tr("By setting the display parameter to \"mobile\", you ensure that the login and the authorization screens will use a mobile layout.")%>
@@ -140,8 +141,9 @@ NSString *platformOauthBaseURL = @"https://<%=Platform::Config.site_base_url %>/
 
 NSString *yourAppURL = [NSString stringWithFormat: @"%@/authorize", YOUR_APP_ID];
 
-NSString *platformOauthURL = [NSString stringWithFormat:@"%@?client_id=%@&redirect_uri=%@&response_type=token&display=mobile", 
-                                                    platformOauthBaseURL, YOUR_APP_ID, yourAppURL];
+NSString *platformOauthURL = [NSString stringWithFormat:
+           @"%@?client_id=%@&redirect_uri=%@&response_type=token&display=mobile", 
+           platformOauthBaseURL, YOUR_APP_ID, yourAppURL];
                          
 [[UIApplication sharedApplication] openURL:[NSURL URLWithString:platformOauthURL]];
 </pre>

data/app/views/platform/developer/registration/index.html.erb

@@ -1,134 +1,19 @@
+<%=platform_scripts_tag %>
+
 <div class="module page_title lengthy">
   <div class="inner">
     <div class="hd">
-      <h1><%= tr('Welcome to #{Platform::Config.site_title} Platform!', 'Client application section title') %></h1>
+      <h1><%= tr("Welcome to #{Platform::Config.site_title} Platform!", 'Client application section title') %></h1>
+			<div style="font-size:14px;color:#888;"><%=tr("Before you can use #{Platform::Config.site_title} API, you must agree to the following terms and policies:")%></div>
     </div>
   </div>
 </div>
 
-<div style="padding:10px;border:1px solid #ccc;overflow:auto;height:500px;margin:10px;font-family:Arial;font-size:12px;">
-	<pre>
-<%=Platform::Config.site_title %> Platform Policies
-
-Introduction
-
-Date of Last Revision: May 24, 2011
-
-<%=Platform::Config.site_title %> Platform is an extension of <%=Platform::Config.site_title %>, whose mission is to give people the power to share and make the world more open and connected.
-
-Platform applications and developers are required to comply with the following documents:
-
-    Statement of Rights and Responsibilities: requirements for anyone who uses <%=Platform::Config.site_title %>.
-    Principles: the spirit of the law for Platform.
-    Policies: the letter of the law for Platform.
-
-Here are some Examples and Explanations for specifics.
-
-Principles
-
-Create a great user experience
-
-    Build social and engaging applications
-    Give users choice and control
-    Help users share expressive and relevant content
-
-Be trustworthy
-
-    Respect privacy
-    Don't mislead, confuse, defraud, or surprise users
-    Don't spam - encourage authentic communications
-
-Policies
-
-I. Features and Functionality
-
-    You must not violate any law or the rights of any individual or entity, and must not expose <%=Platform::Config.site_title %> or <%=Platform::Config.site_title %> users to harm or legal liability as determined by us in our sole discretion.
-    You must not include functionality that proxies, requests or collects <%=Platform::Config.site_title %> usernames or passwords.
-    You must not circumvent (or claim to circumvent) our intended limitations on core <%=Platform::Config.site_title %> features and functionality.
-    If you offer a service for a user that integrates user data into a physical product (such as a scrapbook or calendar), you must only create a physical product for that user's personal and non-commercial use.
-    If you exceed, or plan to exceed, any of the following thresholds please contact us as you may be subject to additional terms: (>5M MAU) or (>100M API calls per day) or (>50M impressions per day).
-    Your website must offer an explicit "Log Out" option that also logs the user out of <%=Platform::Config.site_title %>.
-    Special provisions for apps on Pages:
-
-        a. Apps on Pages must not host media that plays automatically without a user's interaction.
-        b. When a user visits your Page, if they have not given explicit permission by authorizing your <%=Platform::Config.site_title %> app or directly providing information to your Page, you may only use information obtained from us and the user's interaction with your Page in connection with that Page. For example, although you may use aggregate analytics for your individual Page, you must not combine information from any other sources to customize the user's experience on your Page and may not use any information about the user's interaction with your Page in any other context (such as analytics or customization across other Pages or websites).
-
-    You must not use or make derivative use of <%=Platform::Config.site_title %> icons, or use terms for <%=Platform::Config.site_title %> features and functionality, if such use could confuse users into thinking that the reference is to <%=Platform::Config.site_title %> features or functionality.
-
-II. Storing and Using Data You Receive From Us
-
-    You will only request the data you need to operate your application.
-    You may cache data you receive through use of the <%=Platform::Config.site_title %> API in order to improve your application’s user experience, but you should try to keep the data up to date. This permission does not give you any rights to such data.
-    You will have a privacy policy that tells users what user data you are going to use and how you will use, display, share, or transfer that data and you will include your privacy policy URL in the Developer Application.
-    A user's friends' data can only be used in the context of the user's experience on your application.
-    Subject to certain restrictions, including on transfer, users give you their basic account information when they connect with your application. For all other data obtained through use of the <%=Platform::Config.site_title %> API, you must obtain explicit consent from the user who provided the data to us before using it for any purpose other than displaying it back to the user on your application.
-    You will not directly or indirectly transfer any data you receive from us, including user data or <%=Platform::Config.site_title %> User IDs, to (or use such data in connection with) any ad network, ad exchange, data broker, or other advertising or monetization related toolset, even if a user consents to such transfer or use. By indirectly we mean you cannot, for example, transfer data to a third party who then transfers the data to an ad network. By any data we mean all data obtained through use of the <%=Platform::Config.site_title %> Platform (API, Social Plugins, etc.), including aggregate, anonymous or derivative data.
-    You will not use <%=Platform::Config.site_title %> User IDs for any purpose outside your application (e.g., your infrastructure, code, or services necessary to build and run your application). <%=Platform::Config.site_title %> User IDs may be used with external services that you use to build and run your application, such as a web infrastructure service or a distributed computing platform, but only if those services are necessary to running your application and the service has a contractual obligation with you to keep <%=Platform::Config.site_title %> User IDs confidential.
-    If you need an anonymous unique identifier to share outside your application with third parties such as content partners, advertisers, or ad networks, you must use our mechanism. You must never share this anonymous unique identifier with a data broker, information broker, or any other service that we may define as such under our sole discretion.
-    You will not sell any data. If you are acquired by or merge with a third party, you can continue to use user data within your application, but you cannot transfer data outside your application.
-    If you stop using Platform or we disable your application, you must delete all data you have received through use of the <%=Platform::Config.site_title %> API unless: (a) it is basic account information; or (b) you have received explicit consent from the user to retain their data.
-    You cannot use a user’s friend list outside of your application, even if a user consents to such use, but you can use connections between users who have both connected to your application.
-    You will delete all data you receive from us concerning a user if the user asks you to do so, and will provide an easily accessible mechanism for users to make such a request. We may require you to delete data you receive from the <%=Platform::Config.site_title %> API if you violate our terms.
-    You will not include data you receive from us concerning a user in any advertising creative, even if a user consents to such use.
-    You must not give your secret key to another party, unless that party is an agent acting on your behalf as an operator of your application. You are responsible for all activities that occur under your account identifiers.
-
-III. Application Content
-
-    A. Prohibited Content - You are responsible for all content of and within your application, including advertisements and user-generated content. You must not promote, or provide content referencing, facilitating, containing or using, the following:
-        Alcohol-related content (unless the appropriate Demographic Restrictions are used), or sale of tobacco products, ammunition and/or firearms;
-        Content that infringes upon the rights of any third party, including intellectual property rights, privacy, publicity or other personal or proprietary right, or that is deceptive or fraudulent;
-        Gambling, including without limitation, any online casino, sports books, bingo or poker;
-        Illegal activity and/or illegal contests, pyramid schemes, sweepstakes or chain letters; if you run, reference, or facilitate a legally permissible sweepstakes, contest, or other promotion you are subject to <%=Platform::Config.site_title %>'s Promotions Guidelines;
-        Content that is hateful, threatening, defamatory, or pornographic; incites violence; or contains nudity or graphic or gratuitous violence.
-    B. Advertisements and Cross-Promotions
-        You must not include advertisements or promotions, cross-promote other applications, or provide web search functionality in content distributed through <%=Platform::Config.site_title %> social channels.
-        You can only utilize advertising or similar monetization related products or services from companies that appear on this list within Apps on <%=Platform::Config.site_title %>.com.
-
-IV. Application Integration Points
-
-    You must not incentivize users to use (or gate content behind the use of) <%=Platform::Config.site_title %> social channels, or imply that an incentive is directly tied to the use of our channels.
-    You must not pre-fill any of the fields associated with the following products, unless the user manually generated the content earlier in the workflow: Stream stories (user_message parameter for <%=Platform::Config.site_title %>.streamPublish and FB.Connect.streamPublish, and message parameter for stream.publish), Photos (caption), Videos (description), Notes (title and content), Links (comment), and Jabber/XMPP.
-    If a user grants you a publishing permission, you must still obtain consent from the user before taking any action on the user's behalf, such as publishing content or creating an event.
-    You must provide users with an easily identifiable "skip" option whenever you present users with an option to use a <%=Platform::Config.site_title %> social channel.
-    You must not provide users with the option to publish more than one Stream story at a time.
-    Platform integrations, including social plugins:
-        a. Your advertisements must not include or be paired with any Platform integrations, including social plugins such as the Like button, without our written permission.
-        b. You must not sell or purchase placement of a Like button or Like box plugin.
-        c. You must not incentivize users to Like any Page other than your own site or application, and any incentive you provide must be available to new and existing users who Like your Page.
-        d. You must not obscure or cover elements of our social plugins, such as the Like button or Like box plugin.
-    <%=Platform::Config.site_title %> messaging (i.e., email sent to an @<%=Platform::Config.site_title %>.com address) is designed for communication between users, and not a channel for applications to communicate directly with users.
-
-V. Enforcement
-
-We can take enforcement action against you and any or all of your applications if we determine in our sole judgment that you or your application violates <%=Platform::Config.site_title %> Platform Terms and Policies. Enforcement action is both automated and manual, and can include disabling your application, restricting you and your application's access to Platform functionality, terminating our agreements with you, or any other action as we in our sole discretion deem appropriate.
-
-Communication with developers takes place via an email sent from the <%=Platform::Config.site_title %>.com or <%=Platform::Config.site_title %>mail.com domain to the Developer Contact email address registered to the application. To stay in touch, please ensure that your email address is current and that you do not filter out any such messages.
-
-VI. Changes
-
-We can change these Platform Policies at any time without prior notice as we deem necessary. Your continued use of Platform constitutes acceptance of those changes.
-
-VII. Definitions
-
-    By "Application" we mean canvas page application, Platform integration, or any other technical integration we have assigned an application identification number.
-    By "<%=Platform::Config.site_title %> social channel" we mean Application Info Section, Application tab, Feed, requests (including invites), inbox attachments, Chat, Bookmarks, or any other feature of a user profile or <%=Platform::Config.site_title %> communication channel in which or through which an application can provide, display, or deliver content directed at, on behalf of, or by permission of a user.
-    By “basic account information” we mean: name, email, gender, birthday, current city, and profile picture URL.
-    By "<%=Platform::Config.site_title %> Platform Terms and Policies" we mean the Statement of Rights and Responsibilities and the Platform Policies.
-    By "User data you receive from <%=Platform::Config.site_title %>" we mean any data or content (including any images, text, or other information or materials) you receive from us, that was provided by users to us, or was associated by us with a particular user.
-
-VIII. Branding and Promotion Policy
-
-You must follow the guidelines set forth in the <%=Platform::Config.site_title %> Brand Resource and Permissions Center.
-
-IX. Advertising Guidelines
-
-X. <%=Platform::Config.site_title %> Credits
-
-Developers participating in the program for accepting credits are subject to these terms.	
-</pre>	
-</div>
+<iframe src="<%=Platform::Config.developer_agreement_path%>" style="border:1px solid #ccc;width:100%;height:500px;"></iframe>
 
 <div style="text-align:center; padding:15px;">
-  <%= link_to(trl('Agree', 'Client application action label'), {:action => :proceed}, :class=>'button super blue xlarge') %>
+  <button type="button" class="platform_btn platform_submit_btn" onClick="location='/platform/developer/registration/proceed'; return false;">
+      <span><%=tr("Agree")%></span>
+  </button>
   <%=tr("or")%> <%=link_to(tr("Cancel"), Platform::Config.default_url)%>
 </div>