Search Engine Optimization fixes
This commit is contained in:
		@@ -2,8 +2,7 @@ class PagesController < ApplicationController
 | 
				
			|||||||
  layout 'application', :except => [:home, :social_home]
 | 
					  layout 'application', :except => [:home, :social_home]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def home
 | 
					  def home
 | 
				
			||||||
    @menu = 'home'
 | 
					    @menu = 'Internet of Things'
 | 
				
			||||||
    @title = 'Internet of Things'
 | 
					 | 
				
			||||||
    render layout: 'home'
 | 
					    render layout: 'home'
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -62,6 +62,9 @@ class UsersController < ApplicationController
 | 
				
			|||||||
    # output error if user not found
 | 
					    # output error if user not found
 | 
				
			||||||
    render :text => t(:user_not_found) and return if @user.nil?
 | 
					    render :text => t(:user_not_found) and return if @user.nil?
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # set page title
 | 
				
			||||||
 | 
					    @title = @user.login || nil
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # if a json or xml request
 | 
					    # if a json or xml request
 | 
				
			||||||
    if request.format == :json || request.format == :xml
 | 
					    if request.format == :json || request.format == :xml
 | 
				
			||||||
      # authenticate the user if the user is logged in (can be via token) or api key matches the target user
 | 
					      # authenticate the user if the user is logged in (can be via token) or api key matches the target user
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
<% if notice.present? %>
 | 
					<% if notice.present? %>
 | 
				
			||||||
  <p class="flash alert alert-success"><%= notice %><span class="dismiss">X</span></p>
 | 
					  <p class="flash alert alert-success"><%= raw(notice) %><span class="dismiss">X</span></p>
 | 
				
			||||||
<% end %>
 | 
					<% end %>
 | 
				
			||||||
<% if alert.present? %>
 | 
					<% if alert.present? %>
 | 
				
			||||||
  <p class="flash alert alert-danger"><%= alert %><span class="dismiss">X</span></p>
 | 
					  <p class="flash alert alert-danger"><%= raw(alert) %><span class="dismiss">X</span></p>
 | 
				
			||||||
<% end %>
 | 
					<% end %>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
<head>
 | 
					<head>
 | 
				
			||||||
  <title><%= @title.nil? ? (@menu.nil? ? 'ThingSpeak' : @menu.capitalize + ' - ThingSpeak') : @title + ' - ThingSpeak' %></title>
 | 
					  <title><%= @title.nil? ? (@menu.nil? ? 'ThingSpeak' : @menu.titleize + ' - ThingSpeak') : @title + ' - ThingSpeak' %></title>
 | 
				
			||||||
  <meta content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
 | 
					  <meta content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
 | 
				
			||||||
  <meta name="description" content="Open source data platform for the Internet of Things">
 | 
					  <meta name="description" content="<%= "#{@title} on ThingSpeak: " if @title.present? %>Open source data platform and API for the Internet of Things.">
 | 
				
			||||||
  <meta name="keywords" content="iot, internet of things, iot platform, github, open source, internet of things platform, iobridge">
 | 
					  <meta name="keywords" content="iot, internet of things, iot platform, github, open source, internet of things platform, iobridge">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/3.1.1/cerulean/bootstrap.min.css" />
 | 
					  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/3.1.1/cerulean/bootstrap.min.css" />
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -252,10 +252,10 @@ en:
 | 
				
			|||||||
  react_condition_geo: "km from"
 | 
					  react_condition_geo: "km from"
 | 
				
			||||||
  react_latitude: "latitude"
 | 
					  react_latitude: "latitude"
 | 
				
			||||||
  react_longitude: "longitude"
 | 
					  react_longitude: "longitude"
 | 
				
			||||||
  react_twitter_delete_warning1: "Cannot delete this twitter account as it is used by %{reacts_count}: %{reacts_list}"
 | 
					  react_twitter_delete_warning1: "Cannot delete this Twitter account as it is used by %{reacts_count}: %{reacts_list}"
 | 
				
			||||||
  react_twitter_delete_warning2: "Please delete or modify this react before unlinking this twitter account."
 | 
					  react_twitter_delete_warning2: "Please delete or modify this React before unlinking this Twitter account."
 | 
				
			||||||
  react_thinghttp_delete_warning1: "Cannot delete this ThingHTTP as it is used by %{reacts_count}: %{reacts_list}"
 | 
					  react_thinghttp_delete_warning1: "Cannot delete this ThingHTTP as it is used by %{reacts_count}: %{reacts_list}"
 | 
				
			||||||
  react_thinghttp_delete_warning2: "Please delete or modify this react before unlinking this ThingHTTP."
 | 
					  react_thinghttp_delete_warning2: "Please delete or modify this React before unlinking this ThingHTTP."
 | 
				
			||||||
  react_default_name: "React"
 | 
					  react_default_name: "React"
 | 
				
			||||||
  react_delete_message: "Want to delete this React?"
 | 
					  react_delete_message: "Want to delete this React?"
 | 
				
			||||||
  react_label_condition: "Condition"
 | 
					  react_label_condition: "Condition"
 | 
				
			||||||
@@ -365,6 +365,10 @@ en:
 | 
				
			|||||||
  timecontrol_new: "New TimeControl"
 | 
					  timecontrol_new: "New TimeControl"
 | 
				
			||||||
  timecontrol_run_at: 'run at'
 | 
					  timecontrol_run_at: 'run at'
 | 
				
			||||||
  timecontrol_time: 'time'
 | 
					  timecontrol_time: 'time'
 | 
				
			||||||
 | 
					  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_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"
 | 
					  timescale: "Timescale"
 | 
				
			||||||
  time_zone: "Time Zone"
 | 
					  time_zone: "Time Zone"
 | 
				
			||||||
  title: "Title"
 | 
					  title: "Title"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,4 +7,6 @@ Disallow: *.xml
 | 
				
			|||||||
Disallow: *.txt
 | 
					Disallow: *.txt
 | 
				
			||||||
Disallow: *.csv
 | 
					Disallow: *.csv
 | 
				
			||||||
Disallow: /channels/*/charts
 | 
					Disallow: /channels/*/charts
 | 
				
			||||||
Disallow: /channels/public/
 | 
					Disallow: /channels/*/watch
 | 
				
			||||||
 | 
					Disallow: /channels/*/tags
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user