lalala 4.1.0.dev.367 → 4.1.0.dev.375

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5448909848bb92e4e6e4cc22becb7da4c7180c87
-  data.tar.gz: 4595f74a1e5aa5986144e1e6341716b989605dba
+  metadata.gz: e1d34d1c361064e510944ffb7b0ce52d6d20f4f9
+  data.tar.gz: 03d51ab2417ca99c743db05d01b8ea13b323d6dc
 SHA512:
-  metadata.gz: 304e5cb98e42ef5082c2218a98eca36dc92081683c091db62ce0c2f64b389ca4e329c8b2ab4dd8ba62f90ff228123165367799e8b4bb4259b313114a5fe9d55e
-  data.tar.gz: 004f96ef88ab98f2fec6ace4b51f86c9afeaa73d0924cf89c63c413b35b2e8e8ca940ad0fbd1fca3db27e9e633ccc240d5be98eddd21de073b03dd2535cbd43a
+  metadata.gz: ccf21de93636159e713e0a068f0ade9004ee0d0b038e5b64a7519f67f0e01091517b98e0eb1bd5256bc61d07fe83c970e862e2cf281cb90fa286398fe149c20d
+  data.tar.gz: e09709e468e99776476ef304b59694c28e386e4d88e45bd27982d3608692d664301016cbdd230f06fc0e9072372b64190d691d215e1e0a65da401082a316149e

data/app/assets/javascripts/lalala/modules/editor.module.js

@@ -22,6 +22,7 @@ function setup() {
   $markitup_wrapper.find('.close-fullscreen').click(close_fullscreen);
   $markitup_wrapper.find('.markdown-cheatsheet').click(toggle_cheatsheet);
   $markitup_wrapper.find('.add-image').click(add_image_click_handler);
+  $('body').on('click', '.markdown-cheatsheet-close', toggle_cheatsheet);
 }
 
 
@@ -33,18 +34,25 @@ function open_fullscreen(event) {
   var $markitup_wrapper = $(this).closest('.markItUp');
   $markitup_wrapper.find('.markItUpHeader .preview').trigger('mouseup');
   $markitup_wrapper.addClass('fullscreen');
-}
 
+  $('body').on('keyup.MARKDOWN_FULLSCREEN', function (event) {
+    if (event.which === 27) {
+      close_fullscreen(event);
+    }
+  });
+}
 
+//
+// Close fullscreen
+//
 function close_fullscreen(event) {
-  var $markitup_wrapper = $(this).closest('.markItUp');
+  var $markitup_wrapper = $('.close-fullscreen').closest('.markItUp');
   $markitup_wrapper.removeClass('fullscreen');
+  $('body').off('keyup.MARKDOWN_FULLSCREEN');
 }
 
-
-
 //
-//  Cheatsheet
+// Toggle Markdown cheatsheet
 //
 function toggle_cheatsheet(event) {
   var $markdown_cheatsheet = $('#markdown-cheatsheet');
@@ -64,7 +72,9 @@ function toggle_cheatsheet(event) {
   }
 }
 
-
+//
+// Load Markdown syntax cheatsheet
+//
 function load_cheatsheat(options) {
   $.get('/lalala/markdown/cheatsheet', function(data) {
     var $div = $('<div id="markdown-cheatsheet" />');
@@ -81,8 +91,6 @@ function load_cheatsheat(options) {
   });
 }
 
-
-
 //
 //  Images
 //

data/app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss

@@ -1,6 +1,6 @@
 #markdown-cheatsheet {
   @include box-shadow(0 0 10px gray(100));
-  background-color: rgba(255,255,255, 0.95);
+  background-color: #fff;
   bottom: 0;
   overflow: auto;
   padding: 15px;
@@ -42,4 +42,20 @@
 
   }
 
+  .markdown-cheatsheet-close {
+    @include transition(color 220ms ease-in-out);
+    font-size: 20px;
+    font-weight: 100;
+    text-decoration: none;
+    color: rgba(0, 0, 0, 0.45);
+    position: absolute;
+    right: 10px;
+    padding: 10px;
+    top: 10px;
+
+    &:hover {
+      color: rgba(0, 0, 0, 1);
+    }
+  }
+
 }

data/app/views/lalala/markdown/cheatsheet.html.erb

@@ -1,3 +1,5 @@
+<a href="#" class="markdown-cheatsheet-close">&times;</a>
+
 <h2>Markdown Cheatsheet:</h2>
 
 <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">

data/lib/generators/lalala/assets/templates/bower.json.erb

@@ -4,7 +4,7 @@
   "version": "0.0.1",
   "main": "javascripts/application.js",
   "dependencies": {
-    "jquery": "~1.10.2",
+    "jquery": "~1",
     "modernizr": "~2.7.1",
     "respond": "~1.4.2",
     "normalize-scss": "~2.1.3"

data/lib/generators/lalala/install/install_generator.rb

@@ -63,6 +63,19 @@ module Lalala
         gsub_file "config/environments/production.rb", "  # config.assets.precompile += %w( search.js )", "  config.assets.precompile += %w( modernizr.js )"
       end
 
+      def setup_helpers
+        empty_directory "app/helpers"
+        copy_file "helpers/application_helper.rb", "app/helpers/application_helper.rb"
+        template "helpers/open_graph_helper.rb.erb", "app/helpers/open_graph_helper.rb"
+        copy_file "helpers/html_helper.rb", "app/helpers/html_helper.rb"
+        copy_file "helpers/pages_helper.rb", "app/helpers/pages_helper.rb"
+      end
+
+      def setup_locales
+        empty_directory 'config/locales'
+        copy_file 'locales/en.yml', 'config/locales/en.yml'
+      end
+
       def setup_forklift
         empty_directory ".forklift"
       end

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

@@ -0,0 +1,64 @@
+<!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>

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

@@ -0,0 +1,64 @@
+<!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>

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,60 @@
+module HtmlHelper
+
+  # Returns class_name if x equals y
+  #
+  # @param {String}   class_name
+  # @param {Mixed}    x
+  # @param {Mixed}    y
+  # @param {Boolean}  exact
+  #
+  # @return {String}
+  def css_class(class_name, x, y = true, exact = false)
+    if exact
+      class_name if (x === y)
+
+    else
+      class_name if (x == y)
+
+    end
+  end
+
+
+  # Returns CSS body class
+  # By default it shows the current controller & action
+  # You can add items by using @body_class
+  #
+  # @return {String}
+  def body_class
+    body_class = [ params[:controller], params[:action] ]
+    body_class << @body_class if @body_class
+    body_class.join(" ")
+  end
+
+
+  # Return CSS background-image style
+  #
+  # @return {String}
+  def css_bg_img(img_url = nil)
+    "background-image: url('#{img_url}');"
+  end
+
+
+  # Includes inline SVG
+  #
+  # @param {String} path
+  #
+  # @return {String}
+  def inline_svg(path)
+    File.open("app/assets/images/#{path}", "rb") do |file|
+      raw file.read
+    end
+  end
+
+
+  # Render partial
+  #
+  def render_partial(partial_name, locals={}, &block)
+    render partial: partial_name, locals: locals.merge({ block: block })
+  end
+
+end

data/lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb

@@ -0,0 +1,92 @@
+module OpenGraphHelper
+
+  # Returns site name
+  #
+  # @return {String}
+  def site_name
+    "<%= Rails.application.class.name.split("::").first.titlecase.gsub("Client ", "") %>"
+  end
+
+
+  # Returns canonical url and following path for the given key in CANONICAL_URLS hash
+  #
+  # @params {String} path
+  #
+  # @return {String}
+  def canonical_url(path = '/', protocol = nil)
+    protocol ||= request.protocol
+
+    begin
+      "#{protocol}#{ENV["CANONICAL_DOMAIN"]}#{path}"
+
+    rescue
+      Rails.logger.error("canonical_url failed with following argument: #{path}")
+      "#{protocol}#{request.domain}#{path}"
+
+    end
+  end
+
+
+  # Returns meta description.
+  # Default lives in locale file. Add @og_description in your controller
+  # to override default.
+  #
+  # @return {String}
+  def og_description
+    @og_description.strip_tags rescue t("meta.description")
+  end
+
+
+  # Returns default OG image url based on current app name
+  #
+  # @return {String}
+  def og_image_default_url
+    "#{request.protocol}#{request.host_with_port}#{image_path("og-image.png")}"
+  end
+
+
+  # Returns meta og:image tags when @og_image(s) is given
+  #
+  # @return {String}
+  def meta_property_og_image
+    if @og_image
+      tag("meta", property: "og:image", content: "http:#{@og_image.url(:medium)}")
+    end
+
+    if @og_images
+      @og_images.each do |og_image|
+        tag("meta", property: "og:image", content: "http:#{og_image.url(:medium)}")
+      end
+    end
+  end
+
+
+  # Returns the page title, build upon the current page chain, separated by |
+  # To prefix, use @og_title in your controller.
+  #
+  # @param {Integer} offset How many page chain levels you want to skip
+  #
+  # @return {String}
+  def og_title(offset = 0)
+    page_title = []
+
+    if @og_title
+      if offset > 0
+        offset -= 1
+      else
+        page_title << @og_title
+      end
+    end
+
+    current_page_chain.reverse.each_with_index do |page, idx|
+      next if idx < offset
+
+      page_title << page.title unless page.type == "HomePage"
+    end
+
+    page_title << site_name
+
+    page_title.join(' | ')
+  end
+
+end

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

@@ -0,0 +1,15 @@
+module PagesHelper
+
+  # Returns page by class name & puts it in an instance variable
+  #
+  # @param {Class} page_class
+  #
+  # @return {ApplicationPage}
+  def get_page(page_class)
+    key    = "@#{page_class.to_s.underscore.to_sym}"
+
+    page   = instance_variable_get(key)
+    page ||= instance_variable_set(key, page_class.first)
+  end
+
+end

data/lib/generators/lalala/install/templates/locales/en.yml

@@ -0,0 +1,6 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  meta:
+    description: ""

data/lib/lalala/utils/install_template.rb

@@ -5,6 +5,12 @@ class AppBuilder < Rails::AppBuilder
   RUBY_VERSION   = "2.1.0"
   LALALA_VERSION = "4.1.0.dev"
 
+  # You can test the generator locally by pointing to your local gems:
+  #
+  # gem 'lalala',             path: "~/Github/mrhenry/lalala-ng"
+  # gem 'lalala-development', path: "~/Github/mrhenry/lalala-ng", groups: [:development]
+  # gem 'lalala-assets',      path: "~/Github/mrhenry/lalala-ng", groups: [:development, :assets]
+  # gem 'lalala-test',        path: "~/Github/mrhenry/lalala-ng", groups: [:test]
   def gemfile
     create_file 'Gemfile', <<-DOC
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "367"
+  BUILD   = "375"
 
   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.367
+  version: 4.1.0.dev.375
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1409,10 +1409,17 @@ files:
 - lib/generators/lalala/install/templates/active_admin.rb.erb
 - 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
 - lib/generators/lalala/install/templates/errors_controller.rb
+- lib/generators/lalala/install/templates/helpers/application_helper.rb
+- lib/generators/lalala/install/templates/helpers/html_helper.rb
+- lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb
+- lib/generators/lalala/install/templates/helpers/pages_helper.rb
+- lib/generators/lalala/install/templates/locales/en.yml
 - lib/generators/lalala/install/templates/models/admin_user.rb
 - lib/generators/lalala/install/templates/models/application_page.rb
 - lib/generators/lalala/install/templates/pages_controller.rb