lalala 4.1.0.dev.389 → 4.1.0.dev.390

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b42366567189ed7ab7ea6a56fe28f5f69badf89c
-  data.tar.gz: 7b123d500b6b156261ac81e19fb46ad2c8677c51
+  metadata.gz: dfdb52b5dc9c54660630ef7bdd70e511bbecb2de
+  data.tar.gz: 747f630687e09134e7ecdf357b97a24a029839fe
 SHA512:
-  metadata.gz: ee11b9592e604f256c8e37df643eaff9621dcd7ed9d35c328c1e5c189f415d9713a32abd891ffe981e4d20c35fc6276284aceb7ceffd66c5703ea97540fa0c08
-  data.tar.gz: 6379a803821e9e900cf9f0be6271683da315e8651969610851bd5d3a237fe261be7362fad4f1e7bffb8976706a6b29c665194b13dec79408c5c774fb048abcd7
+  metadata.gz: b5b418eb403c559caf3a0988db3dae010f50b6c50d79567713c53edbcaff41e6aaf0ae4b6e4d3d07f196ee3ae859dcc02fb877bd124ed484f2dca4c8b9e08a90
+  data.tar.gz: 178d30c7bc1619a47e227c07b5339d87d83231f9fbdb6d1087a0acf51a248c0440f8c90122ecbbee0a8acb2f56b41dd9eaeda24e6aec5d8e99b631d118540059

data/lib/generators/lalala/install/templates/application.html.erb

@@ -19,7 +19,7 @@
   <meta name="publisher" content="Mr. Henry" />
   <meta name="copyright" content="" />
 
-  <link rel="shortcut icon" href="/assets/favicon.ico"/>
+  <%= favicons %>
   <link rel="canonical" href="<%= canonical_url(request.original_fullpath) %>" />
 
   <meta property="og:url" content="<%= canonical_url(request.original_fullpath) %>" />

data/lib/generators/lalala/install/templates/helpers/application_helper.rb

@@ -1,16 +1,3 @@
 module ApplicationHelper
 
-  # When on .mrhenry.eu domain, we don't want a search crawler to index
-  #
-  # @return {String}
-  def meta_name_robots
-    if request.host.match /.*\.a\.mrhenry\.eu.*/
-      tag("meta", name: "robots", content: "noindex, nofollow")
-
-    else
-      tag("meta", name: "robots", content: "index, follow")
-
-    end
-  end
-
 end

data/lib/generators/lalala/install/templates/helpers/html_helper.rb

@@ -39,6 +39,34 @@ module HtmlHelper
   end
 
 
+  # Returns HTML for all favicons links
+  # Generate icons & code: http://iconogen.com/
+  #
+  # @return {String}
+  def favicons
+    raw <<-HEREDOC
+      <link rel="shortcut icon" href="/assets/favicon.ico" type="image/x-icon" />
+      <link rel="apple-touch-icon" sizes="57x57" href="/assets/apple-touch-icon-57x57.png">
+      <link rel="apple-touch-icon" sizes="60x60" href="/assets/apple-touch-icon-60x60.png">
+      <link rel="apple-touch-icon" sizes="72x72" href="/assets/apple-touch-icon-72x72.png">
+      <link rel="apple-touch-icon" sizes="76x76" href="/assets/apple-touch-icon-76x76.png">
+      <link rel="apple-touch-icon" sizes="114x114" href="/assets/apple-touch-icon-114x114.png">
+      <link rel="apple-touch-icon" sizes="120x120" href="/assets/apple-touch-icon-120x120.png">
+      <link rel="apple-touch-icon" sizes="144x144" href="/assets/apple-touch-icon-144x144.png">
+      <link rel="apple-touch-icon" sizes="152x152" href="/assets/apple-touch-icon-152x152.png">
+      <link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-touch-icon-180x180.png">
+      <link rel="icon" type="image/png" href="/assets/favicon-16x16.png" sizes="16x16">
+      <link rel="icon" type="image/png" href="/assets/favicon-32x32.png" sizes="32x32">
+      <link rel="icon" type="image/png" href="/assets/favicon-96x96.png" sizes="96x96">
+      <link rel="icon" type="image/png" href="/assets/android-chrome-192x192.png" sizes="192x192">
+      <meta name="msapplication-square70x70logo" content="/assets/smalltile.png" />
+      <meta name="msapplication-square150x150logo" content="/assets/mediumtile.png" />
+      <meta name="msapplication-wide310x150logo" content="/assets/widetile.png" />
+      <meta name="msapplication-square310x310logo" content="/assets/largetile.png" />
+    HEREDOC
+  end
+
+
   # Includes inline SVG
   #
   # @param {String} path
@@ -51,6 +79,20 @@ module HtmlHelper
   end
 
 
+  # When on .mrhenry.eu domain, we don't want a search crawler to index
+  #
+  # @return {String}
+  def meta_name_robots
+    if request.host.match /.*\.a\.mrhenry\.eu.*/
+      tag("meta", name: "robots", content: "noindex, nofollow")
+
+    else
+      tag("meta", name: "robots", content: "index, follow")
+
+    end
+  end
+
+
   # Render partial
   #
   def render_partial(partial_name, locals={}, &block)

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "389"
+  BUILD   = "390"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.389
+  version: 4.1.0.dev.390
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1410,7 +1410,6 @@ files:
 - lib/generators/lalala/install/templates/admin_pages.rb
 - lib/generators/lalala/install/templates/admin_users.rb
 - lib/generators/lalala/install/templates/application.html.erb
-- lib/generators/lalala/install/templates/application.html.erb.orig
 - lib/generators/lalala/install/templates/application_mailer.html.erb
 - lib/generators/lalala/install/templates/dashboard.rb
 - lib/generators/lalala/install/templates/devise.rb.erb

data/lib/generators/lalala/install/templates/application.html.erb.orig

@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
-  <title><%= og_title %></title>
-
-  <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
-
-  <meta name="description" content="<%= og_description %>" />
-  <meta name="distribution" content="global" />
-  <%= meta_name_robots %>
-  <meta name="revisit-after" content="31 days" />
-  <meta name="author" content="" />
-  <meta name="publisher" content="Mr. Henry" />
-  <meta name="copyright" content="" />
-
-  <link rel="shortcut icon" href="/assets/favicon.ico"/>
-  <link rel="canonical" href="<%= canonical_url(request.original_fullpath) %>" />
-
-  <meta property="og:url" content="<%= canonical_url(request.original_fullpath) %>" />
-  <meta property="og:title" content="<%= og_title %>" />
-  <meta property="og:site_name" content="<%= site_name %>">
-  <meta property="og:description" content="<%= og_description %>" />
-  <%= meta_property_og_image %>
-  <meta property="og:image" content="<%= og_image_default_url %>" />
-
-  <%= javascript_include_tag "modernizr" %>
-  <%= stylesheet_link_tag "application", media: "all" %>
-
-  <%= csrf_meta_tags %>
-</head>
-<body class="<%= body_class %>">
-
-  <!--[if lt IE 9]>
-    <p class="chromeframe" style="background-color: rgb(255,65,45); color: white; font-size: 12px; margin: 0; padding: 7px; text-align: center;">
-    You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/" style="color: black;">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true" style="color: black;">activate Google Chrome Frame</a> to improve your experience.</p>
-  <![endif]-->
-
-  <%= yield %>
-
-  <script type="text/javascript">
-    // Bridge between I18n YAML & JS
-    window.translations = { };
-  </script>
-
-  <%= javascript_include_tag "application" %>
-
-  <script type="text/javascript">
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-XXXXXX-XX', 'auto');
-    ga('require', 'displayfeatures');
-    ga('send', 'pageview');
-  </script>
-</body>
-</html>