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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b42366567189ed7ab7ea6a56fe28f5f69badf89c
4
- data.tar.gz: 7b123d500b6b156261ac81e19fb46ad2c8677c51
3
+ metadata.gz: dfdb52b5dc9c54660630ef7bdd70e511bbecb2de
4
+ data.tar.gz: 747f630687e09134e7ecdf357b97a24a029839fe
5
5
  SHA512:
6
- metadata.gz: ee11b9592e604f256c8e37df643eaff9621dcd7ed9d35c328c1e5c189f415d9713a32abd891ffe981e4d20c35fc6276284aceb7ceffd66c5703ea97540fa0c08
7
- data.tar.gz: 6379a803821e9e900cf9f0be6271683da315e8651969610851bd5d3a237fe261be7362fad4f1e7bffb8976706a6b29c665194b13dec79408c5c774fb048abcd7
6
+ metadata.gz: b5b418eb403c559caf3a0988db3dae010f50b6c50d79567713c53edbcaff41e6aaf0ae4b6e4d3d07f196ee3ae859dcc02fb877bd124ed484f2dca4c8b9e08a90
7
+ data.tar.gz: 178d30c7bc1619a47e227c07b5339d87d83231f9fbdb6d1087a0acf51a248c0440f8c90122ecbbee0a8acb2f56b41dd9eaeda24e6aec5d8e99b631d118540059
@@ -19,7 +19,7 @@
19
19
  <meta name="publisher" content="Mr. Henry" />
20
20
  <meta name="copyright" content="" />
21
21
 
22
- <link rel="shortcut icon" href="/assets/favicon.ico"/>
22
+ <%= favicons %>
23
23
  <link rel="canonical" href="<%= canonical_url(request.original_fullpath) %>" />
24
24
 
25
25
  <meta property="og:url" content="<%= canonical_url(request.original_fullpath) %>" />
@@ -1,16 +1,3 @@
1
1
  module ApplicationHelper
2
2
 
3
- # When on .mrhenry.eu domain, we don't want a search crawler to index
4
- #
5
- # @return {String}
6
- def meta_name_robots
7
- if request.host.match /.*\.a\.mrhenry\.eu.*/
8
- tag("meta", name: "robots", content: "noindex, nofollow")
9
-
10
- else
11
- tag("meta", name: "robots", content: "index, follow")
12
-
13
- end
14
- end
15
-
16
3
  end
@@ -39,6 +39,34 @@ module HtmlHelper
39
39
  end
40
40
 
41
41
 
42
+ # Returns HTML for all favicons links
43
+ # Generate icons & code: http://iconogen.com/
44
+ #
45
+ # @return {String}
46
+ def favicons
47
+ raw <<-HEREDOC
48
+ <link rel="shortcut icon" href="/assets/favicon.ico" type="image/x-icon" />
49
+ <link rel="apple-touch-icon" sizes="57x57" href="/assets/apple-touch-icon-57x57.png">
50
+ <link rel="apple-touch-icon" sizes="60x60" href="/assets/apple-touch-icon-60x60.png">
51
+ <link rel="apple-touch-icon" sizes="72x72" href="/assets/apple-touch-icon-72x72.png">
52
+ <link rel="apple-touch-icon" sizes="76x76" href="/assets/apple-touch-icon-76x76.png">
53
+ <link rel="apple-touch-icon" sizes="114x114" href="/assets/apple-touch-icon-114x114.png">
54
+ <link rel="apple-touch-icon" sizes="120x120" href="/assets/apple-touch-icon-120x120.png">
55
+ <link rel="apple-touch-icon" sizes="144x144" href="/assets/apple-touch-icon-144x144.png">
56
+ <link rel="apple-touch-icon" sizes="152x152" href="/assets/apple-touch-icon-152x152.png">
57
+ <link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-touch-icon-180x180.png">
58
+ <link rel="icon" type="image/png" href="/assets/favicon-16x16.png" sizes="16x16">
59
+ <link rel="icon" type="image/png" href="/assets/favicon-32x32.png" sizes="32x32">
60
+ <link rel="icon" type="image/png" href="/assets/favicon-96x96.png" sizes="96x96">
61
+ <link rel="icon" type="image/png" href="/assets/android-chrome-192x192.png" sizes="192x192">
62
+ <meta name="msapplication-square70x70logo" content="/assets/smalltile.png" />
63
+ <meta name="msapplication-square150x150logo" content="/assets/mediumtile.png" />
64
+ <meta name="msapplication-wide310x150logo" content="/assets/widetile.png" />
65
+ <meta name="msapplication-square310x310logo" content="/assets/largetile.png" />
66
+ HEREDOC
67
+ end
68
+
69
+
42
70
  # Includes inline SVG
43
71
  #
44
72
  # @param {String} path
@@ -51,6 +79,20 @@ module HtmlHelper
51
79
  end
52
80
 
53
81
 
82
+ # When on .mrhenry.eu domain, we don't want a search crawler to index
83
+ #
84
+ # @return {String}
85
+ def meta_name_robots
86
+ if request.host.match /.*\.a\.mrhenry\.eu.*/
87
+ tag("meta", name: "robots", content: "noindex, nofollow")
88
+
89
+ else
90
+ tag("meta", name: "robots", content: "index, follow")
91
+
92
+ end
93
+ end
94
+
95
+
54
96
  # Render partial
55
97
  #
56
98
  def render_partial(partial_name, locals={}, &block)
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.1.0"
3
- BUILD = "389"
3
+ BUILD = "390"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.dev.389
4
+ version: 4.1.0.dev.390
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2015-03-24 00:00:00.000000000 Z
16
+ date: 2015-04-01 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin
@@ -1410,7 +1410,6 @@ files:
1410
1410
  - lib/generators/lalala/install/templates/admin_pages.rb
1411
1411
  - lib/generators/lalala/install/templates/admin_users.rb
1412
1412
  - lib/generators/lalala/install/templates/application.html.erb
1413
- - lib/generators/lalala/install/templates/application.html.erb.orig
1414
1413
  - lib/generators/lalala/install/templates/application_mailer.html.erb
1415
1414
  - lib/generators/lalala/install/templates/dashboard.rb
1416
1415
  - lib/generators/lalala/install/templates/devise.rb.erb
@@ -1,64 +0,0 @@
1
- <!DOCTYPE html>
2
- <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
3
- <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
4
- <!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
5
- <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
6
- <head>
7
- <meta charset="utf-8">
8
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
9
-
10
- <title><%= og_title %></title>
11
-
12
- <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
13
-
14
- <meta name="description" content="<%= og_description %>" />
15
- <meta name="distribution" content="global" />
16
- <%= meta_name_robots %>
17
- <meta name="revisit-after" content="31 days" />
18
- <meta name="author" content="" />
19
- <meta name="publisher" content="Mr. Henry" />
20
- <meta name="copyright" content="" />
21
-
22
- <link rel="shortcut icon" href="/assets/favicon.ico"/>
23
- <link rel="canonical" href="<%= canonical_url(request.original_fullpath) %>" />
24
-
25
- <meta property="og:url" content="<%= canonical_url(request.original_fullpath) %>" />
26
- <meta property="og:title" content="<%= og_title %>" />
27
- <meta property="og:site_name" content="<%= site_name %>">
28
- <meta property="og:description" content="<%= og_description %>" />
29
- <%= meta_property_og_image %>
30
- <meta property="og:image" content="<%= og_image_default_url %>" />
31
-
32
- <%= javascript_include_tag "modernizr" %>
33
- <%= stylesheet_link_tag "application", media: "all" %>
34
-
35
- <%= csrf_meta_tags %>
36
- </head>
37
- <body class="<%= body_class %>">
38
-
39
- <!--[if lt IE 9]>
40
- <p class="chromeframe" style="background-color: rgb(255,65,45); color: white; font-size: 12px; margin: 0; padding: 7px; text-align: center;">
41
- 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>
42
- <![endif]-->
43
-
44
- <%= yield %>
45
-
46
- <script type="text/javascript">
47
- // Bridge between I18n YAML & JS
48
- window.translations = { };
49
- </script>
50
-
51
- <%= javascript_include_tag "application" %>
52
-
53
- <script type="text/javascript">
54
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
55
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
56
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
57
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
58
-
59
- ga('create', 'UA-XXXXXX-XX', 'auto');
60
- ga('require', 'displayfeatures');
61
- ga('send', 'pageview');
62
- </script>
63
- </body>
64
- </html>