Merge pull request #27 from rubyberlin/design-update

design update

Author: hagenburger

Gemfile

@@ -1,14 +1,12 @@
-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem "middleman", "~>3.2.0"
+gem "middleman"
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload"
 
 # deploy to github pages
 gem "middleman-deploy"
 
 # For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]

Gemfile.lock

@@ -1,55 +1,74 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    chunky_png (1.2.9)
-    coffee-script (2.2.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.3.1)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    compass (0.12.2)
+    coffee-script-source (1.7.1)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
+    erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.2.1)
     ffi (1.9.3)
-    fssm (0.2.10)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
     http_parser.rb (0.5.3)
-    i18n (0.6.5)
-    kramdown (1.2.0)
-    listen (1.3.1)
+    i18n (0.6.11)
+    json (1.8.1)
+    kramdown (1.4.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman (3.2.0)
-      coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+    middleman (3.3.5)
+      coffee-script (~> 2.2)
+      compass (>= 0.12.4)
+      compass-import-once (= 1.0.5)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.0)
+      middleman-core (= 3.3.5)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.1.0)
-    middleman-core (3.2.0)
-      activesupport (~> 3.2.6)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.5)
+      activesupport (~> 4.1.0)
       bundler (~> 1.1)
-      i18n (~> 0.6.1)
-      listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
+      listen (>= 2.7.9, < 3.0)
+      padrino-helpers (~> 0.12.3)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
+      tilt (~> 1.4.1, < 2.0)
     middleman-deploy (0.2.4)
       middleman-core (>= 3.0.0)
       net-sftp
@@ -59,48 +78,58 @@ GEM
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.2.0)
-      middleman-core (~> 3.2)
-      sprockets (~> 2.1)
-      sprockets-helpers (~> 1.0.0)
-      sprockets-sass (~> 1.0.0)
-    multi_json (1.8.2)
+    middleman-sprockets (3.3.9)
+      middleman-core (~> 3.3)
+      sprockets (~> 2.12.1)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.2.0)
+    minitest (5.4.0)
+    multi_json (1.10.1)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
+    padrino-helpers (0.12.3)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.3)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.3)
+      activesupport (>= 3.1)
     ptools (1.2.4)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.2.12)
-    sprockets (2.10.1)
+    sass (3.4.1)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.0.1)
+    sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.2)
+    sprockets-sass (1.2.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    thor (0.18.1)
-    tilt (1.3.7)
-    uglifier (2.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    timers (1.1.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uber (0.0.8)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.2.0)
+  middleman
   middleman-deploy
-  middleman-livereload (~> 3.1.0)
+  middleman-livereload
   wdm (~> 0.1.0)

README.md

@@ -17,7 +17,7 @@ Additions or Changes to the Code of Conduct?
 --------------------------------------------
 
 1. Fork repository.
-2. Open *source/_code-of-conduct.md* and edit it.
+2. Open *source/localizable/_code-of-conduct.<locale>.md* and edit it.
 3. Open a pull request and add some lines why you want it to be changed.
 
 

config.rb

@@ -1,75 +1,29 @@
-###
-# Compass
-###
+activate :i18n, path: '/:locale'
 
-# Change Compass configuration
-# compass_config do |config|
-#   config.output_style = :compact
-# end
+helpers do
 
-###
-# Page options, layouts, aliases and proxies
-###
+  def t(id, replacements = {})
+    text = I18n.t(id)
+    replacements.each do |key, value|
+      text.gsub!(/%\{#{key}(:(.+?))?\}/) { value.gsub('%', $2 || '%') }
+    end
+    text
+  end
 
-# Per-page layout changes:
-#
-# With no layout
-# page "/path/to/file.html", :layout => false
-#
-# With alternative layout
-# page "/path/to/file.html", :layout => :otherlayout
-#
-# A path which all have the same layout
-# with_layout :admin do
-#   page "/admin/*"
-# end
-
-# Proxy pages (http://middlemanapp.com/dynamic-pages/)
-# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
-#  :which_fake_page => "Rendering a fake page with a local variable" }
-
-###
-# Helpers
-###
-
-# Automatic image dimensions on image_tag helper
-# activate :automatic_image_sizes
-
-# Reload the browser automatically whenever files change
-# activate :livereload
-
-# Methods defined in the helpers block are available in templates
-# helpers do
-#   def some_helper
-#     "Helping"
-#   end
-# end
+end
 
 set :css_dir, 'stylesheets'
-
 set :js_dir, 'javascripts'
-
 set :images_dir, 'images'
 
-# Build-specific configuration
 configure :build do
-  # For example, change the Compass output style for deployment
   activate :minify_css
-
-  # Minify Javascript on build
-  # activate :minify_javascript
-
-  # Enable cache buster
-  # activate :asset_hash
-
-  # Use relative URLs
-  # activate :relative_assets
-
-  # Or use a different image path
-  # set :http_prefix, "/Content/images/"
+  activate :asset_hash
+  activate :relative_assets
 end
 
 activate :deploy do |deploy|
   deploy.method = :git
   deploy.build_before = true # default: false
 end
+

locales/en.yml

@@ -0,0 +1,12 @@
+---
+en:
+  header:
+    title: "Berlin Code of Conduct"
+    sub-title: "A Code of Conduct for all User Groups and Conferences"
+  supporters:
+    title: "Supporters"
+    sub-title: "Those user groups and conferences support the Berlin Code of Conduct:"
+    add: "To list your user group/conference here, just add it in a pull request to %{link:our repository}."
+  footer:
+    attribution: "This code of conduct is adapted from the %{link:pdx.rb code of conduct}."
+

locales/es.yml

@@ -0,0 +1,12 @@
+---
+es:
+  header:
+    title: "Berlín Code of Conduct"
+    sub-title: "Un Código de Conducta para todas las Comunidades de Usuarios y Conferencias"
+  supporters:
+    title: "Partidarios/as"
+    sub-title: "Estas Comunidades y Conferencias son partidarias del Berlín Code of Conduct:"
+    add: "Para agregar tu comunidad/conferencia aquí, sólo agrégalo como un Pull Request en %{link:nuestro repositorio}."
+  footer:
+    attribution: "Este código de conducta es una adaptación del %{link:código de conducta de pdx.rb}."
+

source/images/logo.svg

@@ -1,16 +1,19 @@
 <!doctype html>
-<html>
+<html lang="<%= I18n.locale %>">
   <head>
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1" name="viewport">
-    <title>Berlin Code of Conduct</title>
-    <link href="stylesheets/style.css" rel="stylesheet">
+    <meta content="<%= t('header.title') %>" name="description">
+    <title><%= t('header.title') %></title>
+    <link href="<%= asset_url('stylesheets/style.css') %>" rel="stylesheet">
     <script src="//use.typekit.net/vvs3qav.js"></script>
     <script>try{Typekit.load();}catch(e){}</script>
   </head>
   <body class="layout">
-    <%= yield %>
+    <div class="layout--container">
+      <%= yield %>
+    </div>
   </body>
 </html>