Regions can now be organised into a hierarchy.

The region selector is back on the top page, but right under the related country's flag

app/admin/region.rb

@@ -1,3 +1,3 @@
 ActiveAdmin.register Region do
-  permit_params :name
+  permit_params :region_id, :code, :name, :url
 end

app/assets/stylesheets/all.sass

@@ -33,8 +33,8 @@ html
 body
   border: 1px solid #68A6E5
   margin: 0.3em
-  padding: 10px
-  padding-top: 0
+  padding: 2%
+  position: relative
   background-color: white
   header, main, footer
     *
@@ -47,7 +47,7 @@ a
   &:hover, &:active, &:focus
     color: #2E97FF
 
-#flash_messages .flash
+#flash-messages .flash
   color: white
   border: solid 1px #007ba0
   margin: 1em auto
@@ -77,41 +77,17 @@ h3.warning
 
 header.top
   img.logo
-    float: left
-    margin-left: 1%
-
-  ul.countries
-    float: right
-    width: 91px
-    font-size: smaller
-    margin-top: -0.8em
-    line-height: 1em
-    margin-right: 1%
-    list-style-type: none
-    li
-      text-align: left
-      & a:before
-        margin-right: 0.5em
-      &.map_france a:before
-        content: image-url('france.png')
-      &.map_quebec a:before
-        content: image-url('quebec.png')
-      &.map_belgique a:before
-        content: image-url('belgique.png')
-      &.map_suisse a:before
-        content: image-url('suisse.png')
-      &.map_brasil a:before
-        content: image-url('brasil.png')
-
+    left: 2%
+    position: absolute
   h1
-    margin: 0.5em 0
+    margin: 0
     font-size: 2.1em
   h2
     font:
       size: 1.2em
       style: italic
       weight: normal
-    margin-top: -0.8em
+    margin-top: 0
 
 main, body.mce-content-body
   position: relative

app/assets/stylesheets/events.sass

@@ -98,13 +98,9 @@ body.events.index table
 
 .links
   float: right
-  margin-right: 5%
-  padding-right: 2px
 
 a#banner
   float: left
-  margin-left: 5%
-  padding-left: 2px
 
 body.events.show, body.orgas.show, body.tags.show, body.pages
   main

app/assets/stylesheets/mobile.sass

@@ -9,8 +9,6 @@
     max-width: 60em
 
 @media all and (max-width: 1024px)
-  form#orga_search
-    right: 0
   .links, a#banner
     margin: 0.6em auto
 
@@ -22,25 +20,27 @@
 
 @media all and (max-width: 900px)
   header.top
-    img.logo
-      margin-left: 0
-    ul.countries
+    nav
+      top: 0
+      font-size: x-small
       margin-top: 0
       margin-right: 0
+    h1
+      padding-top: 0.5em
 
   body
     border: none
     margin: 0
-    header.top h1
-      margin-top: 0
-      padding-top: 0.3em
+    padding: 1%
     main ul
       margin-left: 0
 
   form#orga_search
-    right: 0 !important
     font-size: smaller !important
 
+  thead th
+    font-size: smaller
+
 /* For small screen width */
 @media all and (max-width: 34em)
   body
@@ -50,7 +50,10 @@
     padding-right: 0.4em
 
   header.top
-    ul.countries
+    img.logo
+      float: left
+      position: inherit
+    nav
       display: none
     h1
       letter-spacing: initial

app/assets/stylesheets/orgas.sass

@@ -4,7 +4,7 @@ img.favicon
   vertical-align: middle
 
 form#orga_search
-  right: 5%
+  right: 0
   width: 15em
   position: absolute
   font-size: larger

app/assets/stylesheets/region.sass

@@ -1,33 +1,33 @@
 .region_selector
-  display: inline-block
-  h3
-    margin: 0
-    .placeholder
-      color: gray
+  top: 0.2em
+  right: 4em
+  position: absolute
+  font-size: smaller
+  & > ul > li
+    float: left
   ul
     margin: 0
     z-index: 10
-    display: none
-    position: absolute
-    margin-top: -7em
     list-style: none
-    box-shadow: 1px 1px 4px gray
-    background-color: white
+    text-align: left
     border-bottom-left-radius: 0.4em
     border-bottom-right-radius: 0.4em
-    li
-      margin: 0
-      a
-        display: block
-        padding: 0.2em 1em
-        border-top: solid thin black
-        &:hover
-          text-shadow: 1px 1px 0.2em gray
-          background-color: #eee
-        em.fa-globe
-          color: red
-  &:hover ul
-    display: block
+    ul
+      position: absolute
+      background-color: white
+      li
+        display: none
+    & li:hover li, li.selected
+      display: block
+  li
+    margin: 0
+    a
+      padding: 0.3em 0.6em
+      display: inline-block
+      border-top: solid thin #eee
+      white-space: nowrap
+    &:hover ul
+      box-shadow: 0 4px 4px gray
 
 body.stats h3
   text-align: center

app/models/region.rb

@@ -1,7 +1,9 @@
 # This is mostly to group events around a region
 class Region < ActiveRecord::Base
+  belongs_to :region
+  has_many :regions
+
   has_many :orgas
-  has_many :events
 
   default_scope { order :name }
 

app/views/events/_form.html.haml

@@ -6,7 +6,7 @@
       = hidden_field_tag :secret, params[:secret]
 
   - if @event.errors.any?
-    #flash_messages
+    #flash-messages
       - @event.errors.full_messages.each do |msg|
         %p.flash.alert= msg
 
@@ -63,8 +63,8 @@
         %option= city
   .field.region
     = f.label :region
-    = f.collection_select :region_id, Region.all, :id, :name,
-      include_blank: true
+    = f.collection_select :region_id, Region.where('region_id is not null'),
+      :id, :name, include_blank: true
   .field.locality
     = f.label :locality
     %span.radios

app/views/layouts/_flash.html.haml

@@ -1,3 +1,3 @@
-#flash_messages
+#flash-messages
   - flash.each do |key, value|
     .flash(class="#{key}")= raw value

app/views/layouts/application.html.haml

@@ -21,23 +21,12 @@
     controller.controller_name, controller.action_name]
   %body{ class: classes }
     %header.top
-      = image_tag 'baby_gnu_adl.png', alt: 'Baby GNU', class: :logo,
-        width: 91, height: 72
-
-      %ul.countries
-        %li.map_france
-          = link_to t('.france'), '//www.agendadulibre.org'
-        %li.map_quebec
-          = link_to t('.quebec'), 'http://www.agendadulibre.qc.ca'
-        %li.map_belgique
-          = link_to t('.belgique'), '//www.agendadulibre.be'
-        %li.map_suisse
-          = link_to t('.suisse'), '//www.agendadulibre.ch'
-        %li.map_brasil
-          = link_to t('.brasil'), 'http://agenda.softwarelivre.org'
+      = image_tag 'baby_gnu_adl.png', alt: '', class: :logo
+      = render '/regions/selector'
 
       %h1= link_to t('.title'), root_path
-      %h2= t '.subtitle'
+      %h2
+        = t '.subtitle'
 
     = render 'layouts/flash', flash: flash if flash.present?
 

app/views/orgas/_form.html.haml

@@ -3,7 +3,7 @@
     = hidden_field_tag :secret, params[:secret]
 
   - if @orga.errors.any?
-    #flash_messages
+    #flash-messages
       - @orga.errors.full_messages.each do |msg|
         %p.flash.alert= msg
 
@@ -41,7 +41,8 @@
     = f.text_field :department
   .field.region
     = f.label :region
-    = f.collection_select :region_id, Region.all, :id, :name
+    = f.collection_select :region_id, Region.where('region_id is not null'),
+      :id, :name, include_blank: true
 
   .field.url
     .helper

app/views/regions/_region.haml

@@ -0,0 +1,19 @@
+- selected = params[:region].to_i == region.id
+
+%li{ class: selected ? 'selected' : '' }
+  - if region.url.present?
+    = link_to region.url do
+      = image_tag "regions/#{region.code}.png" if region.code.present?
+      = region.name
+  - else
+    = link_to region: region.id,
+      start_date: params[:start_date],
+      year: params[:year],
+      tag: params[:tag] do
+      %em.fa.fa-shield
+      = region.name
+      - if selected
+        %em.fa.fa-chevron-down
+  %ul
+    = render partial: '/regions/region',
+      collection: Region.where(region: region)

app/views/regions/_selector.haml

@@ -0,0 +1,3 @@
+-# Choose a region to filter events with
+%nav.region_selector
+  %ul= render partial: '/regions/region', collection: Region.where(region: nil)

config/locales/models/en.yml

@@ -84,6 +84,9 @@ en:
         tag_list: Tags
         reason: Reason
       region:
+        region: Parent region
+        url: Web address
+        code: Code
         name_values:
           all: All regions
       note:

config/locales/models/fr.yml

@@ -84,6 +84,9 @@ fr:
         tag_list: Mots-clés
         reason: Raison
       region:
+        region: Région parent
+        url: Adresse web
+        code: Code
         name_values:
           all: Toutes les régions
       note:

db/migrate/20170508142601_add_parent_region_to_region.rb

@@ -0,0 +1,51 @@
+# Adding parent regions
+class AddParentRegionToRegion < ActiveRecord::Migration
+  def change
+    add_reference :regions, :region, index: true, foreign_key: true
+    add_column :regions, :code, :string
+    add_column :regions, :url, :string
+
+    reversible do |dir|
+      dir.up { create_countries }
+      dir.down { destroy_countries }
+    end
+    to = current_instance
+    Region.where(url: nil).each { |r| r.update region_id: to } if to
+  end
+
+  private
+
+  # Creates the 5 countries corresponding to the 5 main adl instances
+  def create_countries
+    say 'Creates one country/region per (known) agenda: BE, BR, FR, CA-QC, CH'
+    [
+      { name: 'Belgique', code: :BE, url: '//www.agendadulibre.be' },
+      { name: 'Brasil', code: :BR, url: 'http://agenda.softwarelivre.org' },
+      { name: 'France', code: :FR, url: '//www.agendadulibre.org' },
+      { name: 'Québec', code: 'CA-QC', url: 'http://agendadulibre.qc.ca' },
+      { name: 'Suisse', code: :CH, url: '//www.agendadulibre.ch' }
+    ].each { |country| Region.create country }
+  end
+
+  # Attemps to find the proper country associated with your instance
+  def current_instance
+    [
+      ['Namur', :BE],
+      ['Acre', :BR],
+      ['Montréal', 'CA-QC'],
+      ['Berne', :CH],
+      ['Bretagne', :FR]
+    ].find do |data|
+      return Region.find_by(code: data[1]).id if Region.exists? name: data[0]
+    end
+  end
+
+  # Removes the 5 countries corresponding to the main known instances
+  def destroy_countries
+    Region.find_by(name: 'Belgique').try :destroy
+    Region.find_by(name: 'Brasil').try :destroy
+    Region.find_by(name: 'France').try :destroy
+    Region.find_by(name: 'Québec').try :destroy
+    Region.find_by(name: 'Suisse').try :destroy
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170422083422) do
+ActiveRecord::Schema.define(version: 20170508142601) do
 
   create_table "active_admin_comments", force: :cascade do |t|
     t.string   "namespace"
@@ -136,9 +136,14 @@ ActiveRecord::Schema.define(version: 20170422083422) do
   add_index "orgas", ["kind_id"], name: "index_orgas_on_kind_id"
 
   create_table "regions", force: :cascade do |t|
-    t.string "name", limit: 255, default: "", null: false
+    t.string  "name",      limit: 255, default: "", null: false
+    t.integer "region_id"
+    t.string  "code"
+    t.string  "url"
   end
 
+  add_index "regions", ["region_id"], name: "index_regions_on_region_id"
+
   create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"

public/assets/tinymce-ba139c777c65070b041283553b791db5157c065d83ed14cfb2337267401c085f.js

@@ -0,0 +1,22 @@
+(function() {
+  $(document).on('turbolinks:load', function() {
+    return tinyMCE.init({
+      width: 'auto',
+      schema: 'html5',
+      branding: false,
+      language: 'fr_FR',
+      selector: 'textarea.description',
+      content_css: '/assets/application-81d64cbd5a20eb4490b045fc69e67105b8516956f661815957fa59320fbec639.css',
+      entity_encoding: 'raw',
+      add_unload_trigger: true,
+      browser_spellcheck: true,
+      toolbar: [' cut copy paste | undo redo | searchreplace | link image media charmap table | code visualblocks preview fullscreen', ' removeformat | bold italic strikethrough | superscript subscript | bullist numlist | alignleft aligncenter alignright alignjustify alignnone | outdent indent'],
+      plugins: 'lists, advlist, autolink, link, image, charmap, paste, print, preview, table, fullscreen, searchreplace, media, insertdatetime, visualblocks, wordcount, contextmenu, code'
+    });
+  });
+
+  $(document).on('turbolinks:before-cache', function() {
+    return tinymce.remove();
+  });
+
+}).call(this);

public/assets/tinymce/jquery.tinymce-c4e34b289f498e7a8e4ff16c48b895310113eae7c296ac5f17680704bc3a0032.js

@@ -0,0 +1 @@
+!function(){var a={},b=function(b){for(var c=a[b],e=c.deps,f=c.defn,g=e.length,h=new Array(g),i=0;i<g;++i)h[i]=d(e[i]);var j=f.apply(null,h);if(void 0===j)throw"module ["+b+"] returned undefined";c.instance=j},c=function(b,c,d){if("string"!=typeof b)throw"module id must be a string";if(void 0===c)throw"no dependencies for "+b;if(void 0===d)throw"no definition function for "+b;a[b]={deps:c,defn:d,instance:void 0}},d=function(c){var d=a[c];if(void 0===d)throw"module ["+c+"] was undefined";return void 0===d.instance&&b(c),d.instance},e=function(a,b){for(var c=a.length,e=new Array(c),f=0;f<c;++f)e.push(d(a[f]));b.apply(null,b)},f={};f.bolt={module:{api:{define:c,require:e,demand:d}}};var g=c;g("0",[],function(){return function(a){function b(){function a(a){"remove"===a&&this.each(function(a,b){var c=d(b);c&&c.remove()}),this.find("span.mceEditor,div.mceEditor").each(function(a,b){var c=i().get(b.id.replace(/_parent$/,""));c&&c.remove()})}function b(b){var c,d=this;if(null!=b)a.call(d),d.each(function(a,c){var d;(d=i().get(c.id))&&d.setContent(b)});else if(d.length>0&&(c=i().get(d[0].id)))return c.getContent()}function d(a){var b=null;return a&&a.id&&g.tinymce&&(b=i().get(a.id)),b}function e(a){return!!(a&&a.length&&g.tinymce&&a.is(":tinymce"))}var h={};f.each(["text","html","val"],function(a,g){var i=h[g]=f.fn[g],j="text"===g;f.fn[g]=function(a){var g=this;if(!e(g))return i.apply(g,arguments);if(a!==c)return b.call(g.filter(":tinymce"),a),i.apply(g.not(":tinymce"),arguments),g;var h="",k=arguments;return(j?g:g.eq(0)).each(function(a,b){var c=d(b);h+=c?j?c.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):c.getContent({save:!0}):i.apply(f(b),k)}),h}}),f.each(["append","prepend"],function(a,b){var g=h[b]=f.fn[b],i="prepend"===b;f.fn[b]=function(a){var b=this;return e(b)?a!==c?("string"==typeof a&&b.filter(":tinymce").each(function(b,c){var e=d(c);e&&e.setContent(i?a+e.getContent():e.getContent()+a)}),g.apply(b.not(":tinymce"),arguments),b):void 0:g.apply(b,arguments)}}),f.each(["remove","replaceWith","replaceAll","empty"],function(b,c){var d=h[c]=f.fn[c];f.fn[c]=function(){return a.call(this,c),d.apply(this,arguments)}}),h.attr=f.fn.attr,f.fn.attr=function(a,g){var i=this,j=arguments;if(!a||"value"!==a||!e(i))return g!==c?h.attr.apply(i,j):h.attr.apply(i,j);if(g!==c)return b.call(i.filter(":tinymce"),g),h.attr.apply(i.not(":tinymce"),j),i;var k=i[0],l=d(k);return l?l.getContent({save:!0}):h.attr.apply(f(k),j)}}var c,d,e,f,g,h=[];g=a?a:window,f=g.jQuery;var i=function(){return g.tinymce};f.fn.tinymce=function(a){function c(){var c=[],d=0;e||(b(),e=!0),m.each(function(b,e){var f,g=e.id,h=a.oninit;g||(e.id=g=i().DOM.uniqueId()),i().get(g)||(f=i().createEditor(g,a),c.push(f),f.on("init",function(){var a,b=h;m.css("visibility",""),h&&++d==c.length&&("string"==typeof b&&(a=b.indexOf(".")===-1?null:i().resolve(b.replace(/\.\w+$/,"")),b=i().resolve(b)),b.apply(a||i(),c))}))}),f.each(c,function(a,b){b.render()})}var j,k,l,m=this,n="";if(!m.length)return m;if(!a)return i()?i().get(m[0].id):null;if(m.css("visibility","hidden"),g.tinymce||d||!(j=a.script_url))1===d?h.push(c):c();else{d=1,k=j.substring(0,j.lastIndexOf("/")),j.indexOf(".min")!=-1&&(n=".min"),g.tinymce=g.tinyMCEPreInit||{base:k,suffix:n},j.indexOf("gzip")!=-1&&(l=a.language||"en",j=j+(/\?/.test(j)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(a.theme||"modern")+"&plugins="+escape(a.plugins||"")+"&languages="+(l||""),g.tinyMCE_GZ||(g.tinyMCE_GZ={start:function(){function b(a){i().ScriptLoader.markDone(i().baseURI.toAbsolute(a))}b("langs/"+l+".js"),b("themes/"+a.theme+"/theme"+n+".js"),b("themes/"+a.theme+"/langs/"+l+".js"),f.each(a.plugins.split(","),function(a,c){c&&(b("plugins/"+c+"/plugin"+n+".js"),b("plugins/"+c+"/langs/"+l+".js"))})},end:function(){}}));var o=document.createElement("script");o.type="text/javascript",o.onload=o.onreadystatechange=function(b){b=b||window.event,2===d||"load"!=b.type&&!/complete|loaded/.test(o.readyState)||(i().dom.Event.domLoaded=1,d=2,a.script_loaded&&a.script_loaded(),c(),f.each(h,function(a,b){b()}))},o.src=j,document.body.appendChild(o)}return m},f.extend(f.expr[":"],{tinymce:function(a){var b;return!!(a.id&&"tinymce"in g&&(b=i().get(a.id),b&&b.editorManager===i()))}})}}),d("0")()}();

public/assets/tinymce/jquery.tinymce.js

@@ -1 +1 @@
-jquery.tinymce-4708a7ae12d4dd7d315d7475258257d344304f4256b535fc5c4c3ac4fa01986c.js
+jquery.tinymce-c4e34b289f498e7a8e4ff16c48b895310113eae7c296ac5f17680704bc3a0032.js

public/assets/tinymce/jquery.tinymce.js.gz

@@ -1 +1 @@
-jquery.tinymce-4708a7ae12d4dd7d315d7475258257d344304f4256b535fc5c4c3ac4fa01986c.js.gz
+jquery.tinymce-c4e34b289f498e7a8e4ff16c48b895310113eae7c296ac5f17680704bc3a0032.js.gz

public/assets/tinymce/plugins/lists/plugin.js

@@ -1 +1 @@
-plugin-74933ea4fb2807d67d1d82a6a4efd7371ef095c04b41336b512660f21843e1e0.js
+plugin-439184f3c5073bf758b0e541a7ed74c07b48fbab1d80f07a513dd64221e02f10.js

public/assets/tinymce/plugins/lists/plugin.js.gz

@@ -1 +1 @@
-plugin-74933ea4fb2807d67d1d82a6a4efd7371ef095c04b41336b512660f21843e1e0.js.gz
+plugin-439184f3c5073bf758b0e541a7ed74c07b48fbab1d80f07a513dd64221e02f10.js.gz

public/assets/tinymce/plugins/paste/plugin.js

@@ -1 +1 @@
-plugin-5ea2f4e7612eb5648fdd2beacce9818c43afbe2797336e45f589cd023774dd1f.js
+plugin-040ac666f3f6d119fafa14eea1cb3f5e5a6ed39deb6c4c887595fb985dcdc257.js

public/assets/tinymce/plugins/paste/plugin.js.gz

@@ -1 +1 @@
-plugin-5ea2f4e7612eb5648fdd2beacce9818c43afbe2797336e45f589cd023774dd1f.js.gz
+plugin-040ac666f3f6d119fafa14eea1cb3f5e5a6ed39deb6c4c887595fb985dcdc257.js.gz

public/assets/tinymce/plugins/visualblocks/css/visualblocks-859e261c1d940c90994673ce593b60946710cc4f71371164db4ea695035ea593.css

@@ -0,0 +1 @@
+.mce-visualblocks p{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);background-repeat:no-repeat}.mce-visualblocks h1{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);background-repeat:no-repeat}.mce-visualblocks h2{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);background-repeat:no-repeat}.mce-visualblocks h3{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);background-repeat:no-repeat}.mce-visualblocks h4{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);background-repeat:no-repeat}.mce-visualblocks h5{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);background-repeat:no-repeat}.mce-visualblocks h6{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);background-repeat:no-repeat}.mce-visualblocks div:not([data-mce-bogus]){padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);background-repeat:no-repeat}.mce-visualblocks section{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);background-repeat:no-repeat}.mce-visualblocks article{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);background-repeat:no-repeat}.mce-visualblocks blockquote{padding-top:10px;border:1px dashed #BBB;background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);background-repeat:no-repeat}.mce-visualblocks address{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);background-repeat:no-repeat}.mce-visualblocks pre{padding-top:10px;border:1px dashed #BBB;margin-left:3px;background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);background-repeat:no-repeat}.mce-visualblocks figure{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);background-repeat:no-repeat}.mce-visualblocks hgroup{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);background-repeat:no-repeat}.mce-visualblocks aside{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);background-repeat:no-repeat}.mce-visualblocks figcaption{border:1px dashed #BBB}.mce-visualblocks ul{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);background-repeat:no-repeat}.mce-visualblocks ol{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);background-repeat:no-repeat}.mce-visualblocks dl{padding-top:10px;border:1px dashed #BBB;margin:0 0 1em 3px;background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);background-repeat:no-repeat}

public/assets/tinymce/plugins/visualblocks/css/visualblocks.css

@@ -1 +1 @@
-visualblocks-e44e30ebe30e4d3763425a9ea38b558ff13106b8e16a30a74ae21b4c174b3417.css
+visualblocks-859e261c1d940c90994673ce593b60946710cc4f71371164db4ea695035ea593.css

public/assets/tinymce/plugins/visualblocks/css/visualblocks.css.gz

@@ -1 +1 @@
-visualblocks-e44e30ebe30e4d3763425a9ea38b558ff13106b8e16a30a74ae21b4c174b3417.css.gz
+visualblocks-859e261c1d940c90994673ce593b60946710cc4f71371164db4ea695035ea593.css.gz

public/assets/tinymce/themes/modern/theme.js

@@ -1 +1 @@
-theme-4547e25369b8acbbc7101f29494cfd7d289c31d221eb99d0b9d5f340ef3af240.js
+theme-75fc907af2bc496af0f1b70a789778c47c117deda21f376685d6f2a6acdaecfb.js

public/assets/tinymce/themes/modern/theme.js.gz

@@ -1 +1 @@
-theme-4547e25369b8acbbc7101f29494cfd7d289c31d221eb99d0b9d5f340ef3af240.js.gz
+theme-75fc907af2bc496af0f1b70a789778c47c117deda21f376685d6f2a6acdaecfb.js.gz

public/assets/tinymce/tinymce.js

@@ -1 +1 @@
-tinymce-0422648f7dd78a5e2c43b1fad74793a3d3b056cba25af436f1681a4dcba937e6.js
+tinymce-162b504d6c3d7916fbd493991fe9a48e7bcbbffd22cf259e3e1cd8319c7265d9.js

public/assets/tinymce/tinymce.js.gz

@@ -1 +1 @@
-tinymce-0422648f7dd78a5e2c43b1fad74793a3d3b056cba25af436f1681a4dcba937e6.js.gz
+tinymce-162b504d6c3d7916fbd493991fe9a48e7bcbbffd22cf259e3e1cd8319c7265d9.js.gz

test/fixtures/orgas.yml

@@ -1,7 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  kind: lug
+  kind: glug
   name: MyString
   description: MyText
   city: Jolie ville