Merge pull request #4356 from Flaburgan/valid-meta-elements

Valid meta elements, add pod personalization

Changelog.md

@@ -12,6 +12,7 @@
 * Refactor left bar side menu, improve tag autosuggestion design [#4271](https://github.com/diaspora/diaspora/issues/4271), [#4316](https://github.com/diaspora/diaspora/pull/4316)
 * Extract and factorize the header css in a new file, fix ugly header in registration [#4389](https://github.com/diaspora/diaspora/pull/4389)
 * Move contact list on profile to profile information, show user his own contacts on profile [#4360](https://github.com/diaspora/diaspora/pull/4360)
+* Refactor metas, HTML is now valid [#4356](https://github.com/diaspora/diaspora/pull/4356)
 
 ## Bug fixes
 * Check twitter write access before adding/authorizing it for a user. [#4124](https://github.com/diaspora/diaspora/issues/4124)

app/helpers/open_graph_helper.rb

@@ -17,10 +17,6 @@ module OpenGraphHelper
     tags.join(' ')
   end
 
-  def og_site_name
-    meta_tag_with_property('og:site_name', 'Diaspora*')
-  end
-
   def og_description(post)
     meta_tag_with_property('og:description', post_page_title(post, :length => 1000))
   end

app/views/layouts/application.html.haml

@@ -5,20 +5,18 @@
 !!!
 %html{:lang => I18n.locale.to_s, :dir => (rtl?) ? 'rtl' : 'ltr'}
   %head
-    %meta{:charset => 'utf-8'}
-    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}
-
-    %meta{:name => "description", :content => "Diaspora*"}
-    %meta{:name => "author", :content => "Diaspora, Inc."}
-    = og_site_name
+    %title
+      = page_title yield(:page_title)
+      
+    %meta{:charset => 'utf-8'}/
+    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
+    %meta{:name => "description", :content => "Diaspora*"}/
+    %meta{:name => "author", :content => "Diaspora, Inc."}/
+    %meta{:property => "og:site_name", :content => "#{AppConfig.settings.pod_name}"}/
 
     %link{:rel => 'shortcut icon', :href => "#{image_path('favicon.png')}" }
     %link{:rel => 'apple-touch-icon', :href => "#{image_path('apple-touch-icon.png')}"}
 
-    %title
-      = page_title yield(:page_title)
-
-    = og_site_name
     = chartbeat_head_block
     = include_mixpanel
 

app/views/layouts/application.mobile.haml

@@ -8,17 +8,18 @@
     %title
       = pod_name
 
-    %meta{:name => "description", :content => "Diaspora* Mobile"}
-    %meta{:name => "author", :content => "Diaspora, Inc."}
-
-    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
+    %meta{:name => "description", :content => "Diaspora* Mobile"}/
+    %meta{:name => "author", :content => "Diaspora, Inc."}/
+    %meta{:charset => 'utf-8'}/
+    %meta{:property => "og:site_name", :content => "#{AppConfig.settings.pod_name}"}/
+    
     / Viewport scale
-    %meta{:name =>'viewport', :content => "width=device-width, minimum-scale=1 maximum-scale=1"}
-    %meta{:name => "HandheldFriendly", :content => "True"}
-    %meta{:name => "MobileOptimized", :content => "320"}
+    %meta{:name =>'viewport', :content => "width=device-width, minimum-scale=1 maximum-scale=1"}/
+    %meta{:name => "HandheldFriendly", :content => "True"}/
+    %meta{:name => "MobileOptimized", :content => "320"}/
     / Force cleartype on WP7
-    %meta{'http-equiv' => "cleartype", :content => 'on'}
-    = og_site_name
+    %meta{'http-equiv' => "cleartype", :content => 'on'}/    
+    
     / Home screen icon (sized for retina displays)
     %link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'}
     / For Nokia devices