Merge pull request #216 from houdiniproject/description_corrections
Correct metadata descriptions
This commit is contained in:
		
						commit
						0a4d486fdc
					
				
					 7 changed files with 39 additions and 35 deletions
				
			
		|  | @ -1,23 +1,27 @@ | |||
| <%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> | ||||
| <script type="application/ld+json"> | ||||
| { | ||||
| 
 | ||||
| <% schema = { | ||||
|   "@context": "http://schema.org", | ||||
|   "@type": "Event", | ||||
|   "name": "<%= @campaign.name %>", | ||||
|   "description": "<%= @campaign.summary.present? ? raw(@campaign.summary) : raw(@campaign.name) %>", | ||||
|   "url": "<%= url %>", | ||||
|   "name": @campaign.name , | ||||
|   "description": @campaign.summary.present? ? @campaign.summary : @campaign.name , | ||||
|   "url": url , | ||||
|   "location": { | ||||
|     "@type": "Place", | ||||
|     "name": "<%= @campaign.name %>", | ||||
|     "name": @campaign.name , | ||||
|     "address": { | ||||
|       "@type": "PostalAddress", | ||||
|       "addressLocality": "<%= @nonprofit.city %>", | ||||
|       "addressRegion": "<%= @nonprofit.state_code %>", | ||||
|       "postalCode": "<%= @nonprofit.zip_code %>", | ||||
|       "streetAddress": "<%= @nonprofit.address %>" | ||||
|       "addressLocality": @nonprofit.city, | ||||
|       "addressRegion": @nonprofit.state_code, | ||||
|       "postalCode": @nonprofit.zip_code , | ||||
|       "streetAddress":  @nonprofit.address | ||||
|     } | ||||
|   }, | ||||
|   "startDate": "<%= @campaign.created_at %>" | ||||
|   "startDate": @campaign.created_at | ||||
| }  | ||||
| %> | ||||
| 
 | ||||
| <script type="application/ld+json"> | ||||
|   <%= raw(JSON::generate(schema)) %> | ||||
| </script> | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| <%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> | ||||
| <%= content_for(:title_prefix) { "#{@campaign.name} - #{@campaign.nonprofit.name} | ".html_safe } %> | ||||
| <% content_for(:fixed_position_cta_hidden) {'hidden'} %> | ||||
| <%= content_for(:meta_description) {raw @campaign.summary} %> | ||||
| <%= content_for(:meta_description) {@campaign.summary} %> | ||||
| <% @brand_color = @nonprofit.brand_color ? @nonprofit.brand_color : nil %> | ||||
| 
 | ||||
| <%= content_for :javascripts do %> | ||||
|  | @ -44,14 +44,14 @@ | |||
| <% end %> | ||||
| 
 | ||||
| <%= content_for :facebook_tags do %> | ||||
| 	<meta property="og:title" content="<%= raw @campaign.name %>"> | ||||
| 	<meta property="og:description" content="<%= @campaign.summary.present? ? raw(@campaign.summary) : raw(@campaign.name) %>"> | ||||
| 	<meta property="og:title" content="<%= @campaign.name %>"> | ||||
| 	<meta property="og:description" content="<%= @campaign.summary.present? ? @campaign.summary : @campaign.name %>"> | ||||
| 	<meta property="og:image" content="<%= @campaign.main_image_url(:normal) %>"> | ||||
| <% end %> | ||||
| 
 | ||||
| <%= content_for :twitter_tags do %> | ||||
| 	<meta property="twitter:title" content="<%= raw @campaign.name %>"> | ||||
| 	<meta property="twitter:description" content="<%= raw @campaign.summary %>"> | ||||
| 	<meta property="twitter:title" content="<%= @campaign.name %>"> | ||||
| 	<meta property="twitter:description" content="<%= @campaign.summary %>"> | ||||
| 	<meta property="twitter:image" content="<%= @campaign.main_image_url(:normal) %>"> | ||||
| <% end %> | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,20 +1,20 @@ | |||
| <%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> | ||||
| <%= content_for(:title_prefix) {"#{@event.name} - #{@event.nonprofit.name}".html_safe} %> | ||||
| <%= content_for(:meta_description) {raw @event.summary} %> | ||||
| <%= content_for(:meta_description) {@event.summary.html_safe} %> | ||||
| <%= content_for(:stylesheets) {stylesheet_link_tag 'events/show/page'} %> | ||||
| <% content_for(:fixed_position_cta_hidden) {'hidden'} %> | ||||
| 
 | ||||
| <% @brand_color = @nonprofit.brand_color ? @nonprofit.brand_color : nil %> | ||||
| 
 | ||||
| <%= content_for :facebook_tags do %> | ||||
| 	<meta property="og:title" content="<%= raw @event.name %>" /> | ||||
| 	<meta property="og:description" content="<%= @event.summary.present? ? raw(@event.summary) : raw(@event.name) %>" /> | ||||
| 	<meta property="og:title" content="<%= @event.name %>" /> | ||||
| 	<meta property="og:description" content="<%= @event.summary.present? ? @event.summary : @event.name %>" /> | ||||
| 	<meta property="og:image" content="<%= @event.main_image_url(:normal) %>" /> | ||||
| <% end %> | ||||
| 
 | ||||
| <%= content_for :twitter_tags do %> | ||||
| 	<meta property="twitter:title" content="<%= raw @event.name %>" /> | ||||
| 	<meta property="twitter:description" content="<%= raw @event.summary %>" /> | ||||
| 	<meta property="twitter:title" content="<%= @event.name %>" /> | ||||
| 	<meta property="twitter:description" content="<%= @event.summary %>" /> | ||||
| 	<meta property="twitter:image" content="<%= @event.main_image_url(:normal) %>" /> | ||||
| <% end %> | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,19 +1,19 @@ | |||
| <%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> | ||||
| <%= content_for(:title) {"#{@event.name} - #{@event.nonprofit.name}".html_safe} %> | ||||
| <%= content_for(:meta_description) {raw @event.summary} %> | ||||
| <%= content_for(:meta_description) {@event.summary} %> | ||||
| <%= content_for(:stylesheets) {stylesheet_link_tag 'events/stats/page'} %> | ||||
| <% content_for(:footer_hidden) {'hidden'} %> | ||||
| <% content_for(:fixed_position_cta_hidden) {'hidden'} %> | ||||
| 
 | ||||
| <%= content_for :facebook_tags do %> | ||||
|   <meta property="og:title" content="<%= raw @event.name %>" /> | ||||
|   <meta property="og:description" content="<%= raw @event.summary %>" /> | ||||
|   <meta property="og:title" content="<%= @event.name %>" /> | ||||
|   <meta property="og:description" content="<%= @event.summary %>" /> | ||||
|   <meta property="og:image" content="<%= @event.main_image_url(:normal) %>" /> | ||||
| <% end %> | ||||
| 
 | ||||
| <%= content_for :twitter_tags do %> | ||||
|   <meta property="twitter:title" content="<%= raw @event.name %>" /> | ||||
|   <meta property="twitter:description" content="<%= raw @event.summary %>" /> | ||||
|   <meta property="twitter:title" content="<%= @event.name %>" /> | ||||
|   <meta property="twitter:description" content="<%= @event.summary %>" /> | ||||
|   <meta property="twitter:image" content="<%= @event.main_image_url(:normal) %>" /> | ||||
| <% end %> | ||||
| 
 | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ | |||
| 
 | ||||
| <% description = "Robust and user-friendly nonprofit fundraising tools. Campaigns, donor management, donation processing and event ticketing." %> | ||||
| 
 | ||||
| <title><%= yield :title_prefix %><%= Settings.general.name %> <%= content_for?(:title_suffix) ? yield(:title_suffix) : "| #{title}" %> | ||||
| <title><%= yield :title_prefix %> <%= Settings.general.name %> <%= content_for?(:title_suffix) ? yield(:title_suffix) : "| #{title}" %> | ||||
| </title> | ||||
| 
 | ||||
| <% if content_for?(:meta_description) %> | ||||
|  |  | |||
|  | @ -38,8 +38,8 @@ | |||
| <% end %> | ||||
| 
 | ||||
| <%= content_for :twitter_tags do %> | ||||
| 	<meta property="twitter:title" content="I support <%= raw @nonprofit.name %>!"> | ||||
| 	<meta property="twitter:description" content="<%= raw @nonprofit.summary %>"> | ||||
| 	<meta property="twitter:title" content="I support <%=  @nonprofit.name %>!"> | ||||
| 	<meta property="twitter:description" content="<%=  @nonprofit.summary %>"> | ||||
| 	<meta property="twitter:image" content="<%= @nonprofit.main_image_url(:nonprofit_carousel) %>" /> | ||||
| <% end %> | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,17 +1,17 @@ | |||
| <%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> | ||||
| <% content_for(:title_prefix) {"#{@nonprofit.name} - #{@nonprofit.city}, #{@nonprofit.state_code} | ".html_safe} %> | ||||
| <% content_for(:fixed_position_cta_hidden) {'hidden'} %> | ||||
| <% content_for(:meta_description) {raw @nonprofit.summary} %> | ||||
| <% content_for(:meta_description) {@nonprofit.summary} %> | ||||
| <% @brand_color = @nonprofit.brand_color ? @nonprofit.brand_color : nil %> | ||||
| 
 | ||||
| <%= content_for :facebook_tags do %> | ||||
| 	<meta property="og:title" content="<%= raw @nonprofit.name %>" /> | ||||
| 	<meta property="og:description" content="<%= raw @nonprofit.tagline %>" /> | ||||
| 	<meta property="og:title" content="<%= @nonprofit.name %>" /> | ||||
| 	<meta property="og:description" content="<%= @nonprofit.tagline %>" /> | ||||
| 	<meta property="og:image" content="<%= @nonprofit.main_image_url(:nonprofit_carousel) %>" /> | ||||
| <% end %> | ||||
| <%= content_for :twitter_tags do %> | ||||
| 	<meta property="twitter:title" content="<%= raw @nonprofit.name %>" /> | ||||
| 	<meta property="twitter:description" content="<%= raw @nonprofit.tagline %>" /> | ||||
| 	<meta property="twitter:title" content="<%= @nonprofit.name %>" /> | ||||
| 	<meta property="twitter:description" content="<%= @nonprofit.tagline %>" /> | ||||
| 	<meta property="twitter:image" content="<%= @nonprofit.main_image_url(:nonprofit_carousel) %>" /> | ||||
| <% end %> | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Eric Schultz
						Eric Schultz