lalala 4.0.0.dev.219 → 4.0.0.dev.224

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2969d2b645a0bab2323339ced97cf5002d00d8ac
-  data.tar.gz: e7e9af80812c9dd7f86e04e07b0ccc5b31a51bcc
+  metadata.gz: a7314e8f7a9befcc525c6329eeba49e2b2086ac9
+  data.tar.gz: 8e22778b81fc3a18e08931add4f53da8a11aa6d2
 SHA512:
-  metadata.gz: 7a8efe82b6c8a32d7e88a10fb6db2e8a3c5eb01b78828210c872593a48f7d2a5e436c049ac939b03f250ab22fc32579709bc98e58174015b94b8016fd9b790f4
-  data.tar.gz: d8a16664d3f1695c191cf6d26ef3e74d7d395de146ae147eebfaa9be0cb0bf8a6e9b6c89454f8a9c99975f85f55216474c23420ff10b7910e97479b009db3f2b
+  metadata.gz: 511a431c0045a716b6cd1a1814e36045dfb00262246c32dcc09c4d9fb8d003f915198322f56b3a9299f57a8a24a12a56de43d045aa96f4ea872e3480c8d9c297
+  data.tar.gz: 408a133d383a8c593b37e12389237d7318f8a18c5fd3afa6ae359e34009978dec815e9ff1f055e42a72aa9cdc78ec576da3b3696812e10591cf84f3ce7758030

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

@@ -0,0 +1,40 @@
+//
+//  Debounce (from underscore.js)
+//
+exports.debounce = function(func, wait, immediate) {
+  var timeout, args, context, timestamp, result;
+
+  // get time helper
+  var getTime = (Date.now || function() {
+    return new Date().getTime();
+  });
+
+  // debounce
+  return function() {
+    context = this;
+    args = arguments;
+    timestamp = getTime();
+    var later = function() {
+      var last = getTime() - timestamp;
+      if (last < wait) {
+        timeout = setTimeout(later, wait - last);
+      } else {
+        timeout = null;
+        if (!immediate) {
+          result = func.apply(context, args);
+          context = args = null;
+        }
+      }
+    };
+    var callNow = immediate && !timeout;
+    if (!timeout) {
+      timeout = setTimeout(later, wait);
+    }
+    if (callNow) {
+      result = func.apply(context, args);
+      context = args = null;
+    }
+
+    return result;
+  };
+};

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

@@ -3,9 +3,11 @@ var console = require('browser/console'),
     editor = require('lalala/modules/editor'),
     grid = require('lalala/modules/grid'),
     locale_chooser = require("lalala/modules/locale_chooser"),
-    sorted_pages_tree = require("lalala/modules/sorted_pages_tree");
+    sorted_pages_tree = require("lalala/modules/sorted_pages_tree"),
+    login = require("lalala/modules/login");
 
-$(function(){
+$(function() {
+  login.init();
   locale_chooser.init();
   editor.init();
   calendar.init();

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

@@ -1,6 +1,7 @@
 var storage = require("lalala/modules/storage"),
     $chooser;
 
+
 exports.init = function(){
   $chooser = $('.locale_chooser select').first();
 
@@ -9,6 +10,7 @@ exports.init = function(){
   }
 };
 
+
 function setup() {
   var locale = storage.locale,
       default_locale;
@@ -35,10 +37,12 @@ function setup() {
   $chooser.on('change', on_switch_locale);
 }
 
+
 function on_switch_locale(e) {
   switch_locale($(this).val());
 }
 
+
 function switch_locale(locale) {
   var translated = $(".translated[data-locale]"),
       current    = translated.filter("*[data-locale="+locale+"]"),

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

@@ -0,0 +1,66 @@
+var Helpers = require("./helpers");
+
+
+
+function Login(el) {
+  this.$el = $(el);
+  this.$tryout = this.$el.find(".text.tryout");
+
+  this.bind_events();
+  this.$el.find("input").trigger("change");
+}
+
+
+
+//
+//  Events
+//
+Login.prototype.bind_events = function() {
+  this.$el.on("change", "input", $.proxy(this.input_change_handler, this));
+  this.$el.on("keyup", "input", Helpers.debounce($.proxy(this.input_keyup_handler, this), 250));
+};
+
+
+Login.prototype.input_change_handler = function(e) {
+  var $trgt, text, width;
+
+  // input element
+  $trgt = $(e.currentTarget);
+
+  // text
+  text = $trgt.val();
+
+  if ($trgt.attr("type") == "password") {
+    text = new Array(text.length + 1).join("⦁");
+  }
+
+  this.$tryout.text(text);
+
+  // width
+  if (!e.currentTarget.original_width) {
+    e.currentTarget.original_width = $trgt.width();
+  }
+
+  width = this.$tryout.width();
+  if (width < e.currentTarget.original_width) {
+    width = e.currentTarget.original_width;
+  }
+
+  $trgt.width(width);
+};
+
+
+Login.prototype.input_keyup_handler = function(e) {
+  $(e.currentTarget).trigger("change");
+};
+
+
+
+//
+//  Exports
+//
+exports.init = function() {
+  $(".mod-login").each(function() {
+    new Login(this);
+  });
+};

data/app/assets/stylesheets/lalala/base/_mixins.css.scss

@@ -55,3 +55,22 @@
   right: $offset;
   top: $offset;
 }
+
+
+//
+// PLACEHOLDER STYLES (mixin)
+// ----------------------
+//
+// Apply styles to the placeholder
+//
+// Usage:
+// input, textarea {
+//   @include placeholder-styles { color: #aaa; }
+// }
+//
+@mixin placeholder-styles {
+  &::-webkit-input-placeholder { @content }
+  &:-moz-placeholder { @content }
+  &::-moz-placeholder { @content }
+  &:-ms-input-placeholder { @content }
+}

data/app/assets/stylesheets/lalala/modules/_login.css.scss

@@ -1,61 +1,183 @@
 .active_admin.logged_out.new {
 
-  #wrapper {
-    height: 400px;
-    left: 50%;
-    margin: -200px 0 0 -200px;
-    overflow: visible;
-    position: absolute;
-    top: 50%;
-    width: 400px;
+  //
+  //  Containers
+  //
+  #wrapper, #content_wrapper, #active_admin_content {
+    @include spiderman;
   }
 
   #active_admin_content {
     background-color: transparent;
     padding: 0;
+    text-align: center;
     width: auto;
   }
 
-  h2 {
-    @include text-shadow( 1px 1px 0 rgba(0,0,0, 0.2) );
+  #active_admin_content:before {
+    content: '';
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+    margin-right: -0.25em; /* Adjusts for spacing */
+  }
+
+  .mod-login {
+    display: inline-block;
+    text-align: left;
+    vertical-align: middle;
+    width: 650px;
+  }
+
+
+  //
+  //  Text
+  //
+  .text {
     color: white;
-    font-size: 40px;
+    font-size: 50px;
     font-weight: bold;
+    line-height: 52px;
+    margin-bottom: 10px;
+    text-shadow: 1px 1px rgba(black, .325);
   }
 
-  label {
-    width: 120px;
+  span.text {
+    display: inline-block;
+  }
+
+  .text.tryout {
+    left: 0;
+    position: fixed;
+    top: 99%;
+    top: -moz-calc(100% - 1px);
+    top: -webkit-calc(100% - 1px);
+    top: calc(100% - 1px);
+    visibility: hidden;
+    width: auto;
+  }
+
+  label,
+  .flash {
+    display: none;
+  }
+
+  //
+  //  Input fields
+  //
+  .input {
+    margin: -4px 0 0;
+  }
+
+  .inputs {
+    margin: 14px 0 0;
+    white-space: nowrap;
+  }
+
+  .inputs > ol > li {
+    display: inline-block;
+    margin-right: 13px;
+  }
+
+  .inputs .text {
+    position: relative;
+    top: -2px;
   }
 
-  input[type=email],
-  input[type=password] {
-    @include transition( background-color 300ms );
-    background-color: rgba(0,0,0, 0.1);
-    font-size: 35px;
+  input[type="email"],
+  input[type="password"] {
+    @include box-sizing(border-box);
+    @include transition(background-color 600ms, border-color 600ms);
+
+    background: none;
+    border: 0;
+    border-bottom: 2px solid rgba($blue, .5);
+    border-radius: 0;
+    box-shadow: none;
+    color: lighten($blue, 10);
+    display: inline-block;
+    font-size: 50px;
     font-weight: bold;
-    padding: 10px 20px;
+    height: 66px;
+    line-height: 56px;
+    padding: 0;
+    position: relative;
+    top: -2px;
+    width: 120px;
 
-    &:focus {
-      background-color: transparentize($yellow, 0.9);
-      color: darken($yellow, 50%);
+    @include placeholder-styles {
+      @include transition(color 600ms, text-shadow 600ms);
+      color: white;
+      text-shadow: 1px 1px rgba(black, .325);
+      text-transform: lowercase;
     }
+  }
 
+  input[type="password"] {
+    width: 233px;
   }
 
-  #admin_user_remember_me_input {
-    display: none;
+  input[type="email"],
+  input[type="password"] { &:focus {
+    @include placeholder-styles {
+      color: rgba(white, .75);
+      text-shadow: 1px 1px rgba(black, .05);
+    }
+  }}
+
+  //
+  //  Actions
+  //
+  .actions {
+    margin: 90px 0 0 -50px;
+    position: relative;
+
+    button, .version {
+      @include transition(background-color 600ms);
+    }
   }
 
-  input[name="commit"] {
-    background-image: none;
-    font-size: 20px;
-    margin-top: 10px;
-    padding-left: 12px;
+  .actions button {
+    background: #bbb image-url("lalala/overlay-logo.png") 0 0;
+    border: 0;
+    border-radius: 10px;
+    cursor: pointer;
+    display: block;
+    height: 90px;
+    outline: none;
+    text-indent: -9999px;
+    width: 280px;
   }
 
-  .flash {
+  .actions button.error {
+    &, & + .version { background-color: $button_red; }
+  }
+
+  .actions button.glow,
+  .actions button:focus,
+  .actions button:hover { &, & + .version {
+    background-color: rgba($blue, .5);
+  }}
+
+  .actions .version {
+    @include background-image(
+      linear-gradient(rgba(black, 0), rgba(black, .125))
+    );
+
+    background-color: #bbb;
+    border-bottom: 1px solid rgba(black, .25);
+    border-radius: 10px;
+    color: white;
+    display: inline-block;
+    font-size: 10px;
+    font-weight: bold;
+    height: 16px;
+    left: 235px;
+    line-height: 16px;
+    padding: 1px 9px 0;
     position: absolute;
-    top: -70px;
+    text-shadow: 1px 1px rgba(black, .3);
+    top: -19px;
   }
 
 }

data/app/assets/stylesheets/lalala/modules/_title-bar.css.scss

@@ -30,8 +30,31 @@
     }
 
     .locale_chooser {
+      border-left: 1px solid #dcdcdc;
       float: right;
-      padding: 14px 12px 14px 0;
+    }
+  }
+
+  //
+  //  Locale chooser
+  //
+  .locale_chooser select {
+    @include appearance(none);
+
+    border: 0;
+    border-radius: 0;
+    color: black;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    height: $top_nav_height;
+    line-height: $top_nav_height + 2;
+    padding: 0 24px;
+    vertical-align: top;
+
+    &:focus {
+      border: none;
+      box-shadow: none;
     }
   }
 
@@ -59,7 +82,7 @@
   }
 
   //
-  // Current page title
+  //  Current page title
   //
   h2 {
     color: gray(211);

data/app/views/active_admin/devise/sessions/new.html.erb

@@ -0,0 +1,43 @@
+<div class="mod-login">
+  <% scope = Devise::Mapping.find_scope!(resource_name) %>
+  <%= active_admin_form_for(resource, :as => resource_name, :url => send(:"#{scope}_session_path"), :html => { :id => "session_new" }) do |f|
+    alert = flash.now[:alert]
+    button_css_class = (alert && alert.to_s.downcase.include?("invalid")) ? "error" : ""
+
+    f.form_buffers.last << raw(<<-EOS
+      <div class="text">
+        #{ t("login.a") }
+      </div>
+    EOS
+    )
+
+    f.inputs do
+      resource.class.authentication_keys.each { |key|
+        f.input key, input_html: {
+          placeholder: t('active_admin.devise.login.title'),
+          autofocus: true
+        }
+      }
+
+      f.form_buffers.last << raw("<span class=\"text\">#{ t("login.b") }</span>")
+      f.form_buffers.last << raw("<br>")
+
+      f.input :password, input_html: {
+        placeholder: "Password"
+      }
+
+      f.form_buffers.last << raw("<span class=\"text\">#{ t("login.c") }</span>")
+    end
+
+    f.form_buffers.last << raw(<<-EOS
+      <fieldset class="actions">
+        <button type="submit" class="#{ button_css_class }">#{ t('active_admin.devise.login.submit') }</button>
+        <span class="version">VERSION #{ Lalala::BUILD_VERSION }</span>
+      </fieldset>
+    EOS
+    )
+  end
+  %>
+
+  <div class="text tryout"></div>
+</div>

data/config/locales/en.yml

@@ -0,0 +1,512 @@
+en:
+  login:
+    a: "Hello you,<br> can I have your"
+    b: "and"
+    c: "?"
+
+  i18n:
+    languages:
+      ab: "Abkhazian"
+      ace: "Achinese"
+      ach: "Acoli"
+      ada: "Adangme"
+      ady: "Adyghe"
+      ae: "Avestan"
+      af: "Afrikaans"
+      afa: "Afro-Asiatic Language"
+      afh: "Afrihili"
+      ain: "Ainu"
+      ak: "Akan"
+      akk: "Akkadian"
+      ale: "Aleut"
+      alg: "Algonquian Language"
+      alt: "Southern Altai"
+      am: "Amharic"
+      an: "Aragonese"
+      ang: "Old English"
+      anp: "Angika"
+      apa: "Apache Language"
+      ar: "Arabic"
+      arc: "Aramaic"
+      arn: "Araucanian"
+      arp: "Arapaho"
+      art: "Artificial Language"
+      arw: "Arawak"
+      as: "Assamese"
+      ast: "Asturian"
+      ath: "Athapascan Language"
+      aus: "Australian Language"
+      av: "Avaric"
+      awa: "Awadhi"
+      ay: "Aymara"
+      az: "Azerbaijani"
+      ba: "Bashkir"
+      bad: "Banda"
+      bai: "Bamileke Language"
+      bal: "Baluchi"
+      ban: "Balinese"
+      bas: "Basa"
+      bat: "Baltic Language"
+      be: "Belarusian"
+      bej: "Beja"
+      bem: "Bemba"
+      ber: "Berber"
+      bg: "Bulgarian"
+      bh: "Bihari"
+      bho: "Bhojpuri"
+      bi: "Bislama"
+      bik: "Bikol"
+      bin: "Bini"
+      bla: "Siksika"
+      bm: "Bambara"
+      bn: "Bengali"
+      bnt: "Bantu"
+      bo: "Tibetan"
+      br: "Breton"
+      bra: "Braj"
+      bs: "Bosnian"
+      btk: "Batak"
+      bua: "Buriat"
+      bug: "Buginese"
+      byn: "Blin"
+      ca: "Catalan"
+      cad: "Caddo"
+      cai: "Central American Indian Language"
+      car: "Carib"
+      cau: "Caucasian Language"
+      cch: "Atsam"
+      ce: "Chechen"
+      ceb: "Cebuano"
+      cel: "Celtic Language"
+      ch: "Chamorro"
+      chb: "Chibcha"
+      chg: "Chagatai"
+      chk: "Chuukese"
+      chm: "Mari"
+      chn: "Chinook Jargon"
+      cho: "Choctaw"
+      chp: "Chipewyan"
+      chr: "Cherokee"
+      chy: "Cheyenne"
+      cmc: "Chamic Language"
+      co: "Corsican"
+      cop: "Coptic"
+      cpe: "English-based Creole or Pidgin"
+      cpf: "French-based Creole or Pidgin"
+      cpp: "Portuguese-based Creole or Pidgin"
+      cr: "Cree"
+      crh: "Crimean Turkish"
+      crp: "Creole or Pidgin"
+      cs: "Czech"
+      csb: "Kashubian"
+      cu: "Church Slavic"
+      cus: "Cushitic Language"
+      cv: "Chuvash"
+      cy: "Welsh"
+      da: "Danish"
+      dak: "Dakota"
+      dar: "Dargwa"
+      day: "Dayak"
+      de: "German"
+      "de-AT": "Austrian German"
+      "de-CH": "Swiss High German"
+      del: "Delaware"
+      den: "Slave"
+      dgr: "Dogrib"
+      din: "Dinka"
+      doi: "Dogri"
+      dra: "Dravidian Language"
+      dsb: "Lower Sorbian"
+      dua: "Duala"
+      dum: "Middle Dutch"
+      dv: "Divehi"
+      dyu: "Dyula"
+      dz: "Dzongkha"
+      ee: "Ewe"
+      efi: "Efik"
+      egy: "Ancient Egyptian"
+      eka: "Ekajuk"
+      el: "Greek"
+      elx: "Elamite"
+      en: "English"
+      "en-AU": "Australian English"
+      "en-CA": "Canadian English"
+      "en-GB": "British English"
+      "en-US": "U.S. English"
+      enm: "Middle English"
+      eo: "Esperanto"
+      es: "Spanish"
+      "es-ES": "Iberian Spanish"
+      et: "Estonian"
+      eu: "Basque"
+      ewo: "Ewondo"
+      fa: "Persian"
+      fan: "Fang"
+      fat: "Fanti"
+      ff: "Fulah"
+      fi: "Finnish"
+      fil: "Filipino"
+      fiu: "Finno-Ugrian Language"
+      fj: "Fijian"
+      fo: "Faroese"
+      fon: "Fon"
+      fr: "French"
+      "fr-CA": "Canadian French"
+      "fr-CH": "Swiss French"
+      frm: "Middle French"
+      fro: "Old French"
+      frr: "Northern Frisian"
+      frs: "Eastern Frisian"
+      fur: "Friulian"
+      fy: "Western Frisian"
+      ga: "Irish"
+      gaa: "Ga"
+      gay: "Gayo"
+      gba: "Gbaya"
+      gd: "Scottish Gaelic"
+      gem: "Germanic Language"
+      gez: "Geez"
+      gil: "Gilbertese"
+      gl: "Galician"
+      gmh: "Middle High German"
+      gn: "Guarani"
+      goh: "Old High German"
+      gon: "Gondi"
+      gor: "Gorontalo"
+      got: "Gothic"
+      grb: "Grebo"
+      grc: "Ancient Greek"
+      gsw: "Swiss German"
+      gu: "Gujarati"
+      gv: "Manx"
+      gwi: "Gwichʼin"
+      ha: "Hausa"
+      hai: "Haida"
+      haw: "Hawaiian"
+      he: "Hebrew"
+      hi: "Hindi"
+      hil: "Hiligaynon"
+      him: "Himachali"
+      hit: "Hittite"
+      hmn: "Hmong"
+      ho: "Hiri Motu"
+      hr: "Croatian"
+      hsb: "Upper Sorbian"
+      ht: "Haitian"
+      hu: "Hungarian"
+      hup: "Hupa"
+      hy: "Armenian"
+      hz: "Herero"
+      ia: "Interlingua"
+      iba: "Iban"
+      id: "Indonesian"
+      ie: "Interlingue"
+      ig: "Igbo"
+      ii: "Sichuan Yi"
+      ijo: "Ijo"
+      ik: "Inupiaq"
+      ilo: "Iloko"
+      inc: "Indic Language"
+      ine: "Indo-European Language"
+      inh: "Ingush"
+      io: "Ido"
+      ira: "Iranian Language"
+      iro: "Iroquoian Language"
+      is: "Icelandic"
+      it: "Italian"
+      iu: "Inuktitut"
+      ja: "Japanese"
+      jbo: "Lojban"
+      jpr: "Judeo-Persian"
+      jrb: "Judeo-Arabic"
+      jv: "Javanese"
+      ka: "Georgian"
+      kaa: "Kara-Kalpak"
+      kab: "Kabyle"
+      kac: "Kachin"
+      kaj: "Jju"
+      kam: "Kamba"
+      kar: "Karen"
+      kaw: "Kawi"
+      kbd: "Kabardian"
+      kcg: "Tyap"
+      kfo: "Koro"
+      kg: "Kongo"
+      kha: "Khasi"
+      khi: "Khoisan Language"
+      kho: "Khotanese"
+      ki: "Kikuyu"
+      kj: "Kuanyama"
+      kk: "Kazakh"
+      kl: "Kalaallisut"
+      km: "Khmer"
+      kmb: "Kimbundu"
+      kn: "Kannada"
+      ko: "Korean"
+      kok: "Konkani"
+      kos: "Kosraean"
+      kpe: "Kpelle"
+      kr: "Kanuri"
+      krc: "Karachay-Balkar"
+      krl: "Karelian"
+      kro: "Kru"
+      kru: "Kurukh"
+      ks: "Kashmiri"
+      ku: "Kurdish"
+      kum: "Kumyk"
+      kut: "Kutenai"
+      kv: "Komi"
+      kw: "Cornish"
+      ky: "Kirghiz"
+      la: "Latin"
+      lad: "Ladino"
+      lah: "Lahnda"
+      lam: "Lamba"
+      lb: "Luxembourgish"
+      lez: "Lezghian"
+      lg: "Ganda"
+      li: "Limburgish"
+      ln: "Lingala"
+      lo: "Lao"
+      lol: "Mongo"
+      loz: "Lozi"
+      lt: "Lithuanian"
+      lu: "Luba-Katanga"
+      lua: "Luba-Lulua"
+      lui: "Luiseno"
+      lun: "Lunda"
+      luo: "Luo"
+      lus: "Lushai"
+      lv: "Latvian"
+      mad: "Madurese"
+      mag: "Magahi"
+      mai: "Maithili"
+      mak: "Makasar"
+      man: "Mandingo"
+      map: "Austronesian Language"
+      mas: "Masai"
+      mdf: "Moksha"
+      mdr: "Mandar"
+      men: "Mende"
+      mg: "Malagasy"
+      mga: "Middle Irish"
+      mh: "Marshallese"
+      mi: "Maori"
+      mic: "Micmac"
+      min: "Minangkabau"
+      mis: "Miscellaneous Language"
+      mk: "Macedonian"
+      mkh: "Mon-Khmer Language"
+      ml: "Malayalam"
+      mn: "Mongolian"
+      mnc: "Manchu"
+      mni: "Manipuri"
+      mno: "Manobo Language"
+      mo: "Moldavian"
+      moh: "Mohawk"
+      mos: "Mossi"
+      mr: "Marathi"
+      ms: "Malay"
+      mt: "Maltese"
+      mul: "Multiple Languages"
+      mun: "Munda Language"
+      mus: "Creek"
+      mwl: "Mirandese"
+      mwr: "Marwari"
+      my: "Burmese"
+      myn: "Mayan Language"
+      myv: "Erzya"
+      na: "Nauru"
+      nah: "Nahuatl"
+      nai: "North American Indian Language"
+      nap: "Neapolitan"
+      nb: "Norwegian Bokmål"
+      nd: "North Ndebele"
+      nds: "Low German"
+      ne: "Nepali"
+      new: "Newari"
+      ng: "Ndonga"
+      nia: "Nias"
+      nic: "Niger-Kordofanian Language"
+      niu: "Niuean"
+      nl: "Dutch"
+      "nl-BE": "Flemish"
+      nn: "Norwegian Nynorsk"
+      no: "Norwegian"
+      nog: "Nogai"
+      non: "Old Norse"
+      nqo: "N’Ko"
+      nr: "South Ndebele"
+      nso: "Northern Sotho"
+      nub: "Nubian Language"
+      nv: "Navajo"
+      nwc: "Classical Newari"
+      ny: "Nyanja"
+      nym: "Nyamwezi"
+      nyn: "Nyankole"
+      nyo: "Nyoro"
+      nzi: "Nzima"
+      oc: "Occitan"
+      oj: "Ojibwa"
+      om: "Oromo"
+      or: "Oriya"
+      os: "Ossetic"
+      osa: "Osage"
+      ota: "Ottoman Turkish"
+      oto: "Otomian Language"
+      pa: "Punjabi"
+      paa: "Papuan Language"
+      pag: "Pangasinan"
+      pal: "Pahlavi"
+      pam: "Pampanga"
+      pap: "Papiamento"
+      pau: "Palauan"
+      peo: "Old Persian"
+      phi: "Philippine Language"
+      phn: "Phoenician"
+      pi: "Pali"
+      pl: "Polish"
+      pon: "Pohnpeian"
+      pra: "Prakrit Language"
+      pro: "Old Provençal"
+      ps: "Pashto"
+      pt: "Portuguese"
+      "pt-BR": "Brazilian Portuguese"
+      "pt-PT": "Iberian Portuguese"
+      qu: "Quechua"
+      raj: "Rajasthani"
+      rap: "Rapanui"
+      rar: "Rarotongan"
+      rm: "Rhaeto-Romance"
+      rn: "Rundi"
+      ro: "Romanian"
+      roa: "Romance Language"
+      rom: "Romany"
+      ru: "Russian"
+      rup: "Aromanian"
+      rw: "Kinyarwanda"
+      sa: "Sanskrit"
+      sad: "Sandawe"
+      sah: "Yakut"
+      sai: "South American Indian Language"
+      sal: "Salishan Language"
+      sam: "Samaritan Aramaic"
+      sas: "Sasak"
+      sat: "Santali"
+      sc: "Sardinian"
+      scn: "Sicilian"
+      sco: "Scots"
+      sd: "Sindhi"
+      se: "Northern Sami"
+      sel: "Selkup"
+      sem: "Semitic Language"
+      sg: "Sango"
+      sga: "Old Irish"
+      sgn: "Sign Language"
+      sh: "Serbo-Croatian"
+      shn: "Shan"
+      si: "Sinhala"
+      sid: "Sidamo"
+      sio: "Siouan Language"
+      sit: "Sino-Tibetan Language"
+      sk: "Slovak"
+      sl: "Slovenian"
+      sla: "Slavic Language"
+      sm: "Samoan"
+      sma: "Southern Sami"
+      smi: "Sami Language"
+      smj: "Lule Sami"
+      smn: "Inari Sami"
+      sms: "Skolt Sami"
+      sn: "Shona"
+      snk: "Soninke"
+      so: "Somali"
+      sog: "Sogdien"
+      son: "Songhai"
+      sq: "Albanian"
+      sr: "Serbian"
+      srn: "Sranan Tongo"
+      srr: "Serer"
+      ss: "Swati"
+      ssa: "Nilo-Saharan Language"
+      st: "Southern Sotho"
+      su: "Sundanese"
+      suk: "Sukuma"
+      sus: "Susu"
+      sux: "Sumerian"
+      sv: "Swedish"
+      sw: "Swahili"
+      syc: "Classical Syriac"
+      syr: "Syriac"
+      ta: "Tamil"
+      tai: "Tai Language"
+      te: "Telugu"
+      tem: "Timne"
+      ter: "Tereno"
+      tet: "Tetum"
+      tg: "Tajik"
+      th: "Thai"
+      ti: "Tigrinya"
+      tig: "Tigre"
+      tiv: "Tiv"
+      tk: "Turkmen"
+      tkl: "Tokelau"
+      tl: "Tagalog"
+      tlh: "Klingon"
+      tli: "Tlingit"
+      tmh: "Tamashek"
+      tn: "Tswana"
+      to: "Tonga"
+      tog: "Nyasa Tonga"
+      tpi: "Tok Pisin"
+      tr: "Turkish"
+      trv: "Taroko"
+      ts: "Tsonga"
+      tsi: "Tsimshian"
+      tt: "Tatar"
+      tum: "Tumbuka"
+      tup: "Tupi Language"
+      tut: "Altaic Language"
+      tvl: "Tuvalu"
+      tw: "Twi"
+      ty: "Tahitian"
+      tyv: "Tuvinian"
+      udm: "Udmurt"
+      ug: "Uighur"
+      uga: "Ugaritic"
+      uk: "Ukrainian"
+      umb: "Umbundu"
+      und: "Unknown or Invalid Language"
+      ur: "Urdu"
+      uz: "Uzbek"
+      vai: "Vai"
+      ve: "Venda"
+      vi: "Vietnamese"
+      vo: "Volapük"
+      vot: "Votic"
+      wa: "Walloon"
+      wak: "Wakashan Language"
+      wal: "Walamo"
+      war: "Waray"
+      was: "Washo"
+      wen: "Sorbian Language"
+      wo: "Wolof"
+      xal: "Kalmyk"
+      xh: "Xhosa"
+      yao: "Yao"
+      yap: "Yapese"
+      yi: "Yiddish"
+      yo: "Yoruba"
+      ypk: "Yupik Language"
+      za: "Zhuang"
+      zap: "Zapotec"
+      zbl: "Blissymbols"
+      zen: "Zenaga"
+      zh: "Chinese"
+      zh-Hans: "Simplified Chinese"
+      zh-Hant: "Traditional Chinese"
+      znd: "Zande"
+      zu: "Zulu"
+      zun: "Zuni"
+      zxx: "No linguistic content"
+      zza: "Zaza"

data/lib/lalala/ext_i18n.rb

@@ -5,4 +5,5 @@ module Lalala::ExtI18n
   autoload :NegotiationAdapter
   autoload :TestNegotiationAdapter
   autoload :LocaleSource
+  autoload :NameForLocale
 end

data/lib/lalala/ext_i18n/name_for_locale.rb

@@ -0,0 +1,9 @@
+module Lalala::ExtI18n::NameForLocale
+
+  def self.name_for_locale(locale)
+    I18n.backend.translate(locale, "i18n.languages.#{locale}", default: locale.to_s)
+  rescue I18n::MissingTranslationData
+    locale.to_s
+  end
+
+end

data/lib/lalala/version.rb

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

data/lib/lalala/views/title_bar.rb

@@ -14,14 +14,14 @@ class Lalala::Views::TitleBar < ActiveAdmin::Views::TitleBar
     locales.sort!
 
     div :class => "locale_chooser" do
-      select do
+      select(class: "bypass-chosen") do
 
         locales.each do |locale|
           opts = { :value => locale.to_s }
           opts[:'data-default'] = "true" if I18n.default_locale == locale
           opts[:'data-current'] = "true" if I18n.locale == locale
           option opts do
-            text_node locale.to_s
+            text_node Lalala::ExtI18n::NameForLocale.name_for_locale(locale)
           end
         end
 

data/test/dummy/app/models/article.rb

@@ -3,7 +3,10 @@ class Article < ActiveRecord::Base
 
   has_one_asset :image
 
-  validates :title,
-    presence: true
+  # Translations
+  translates :title, :body
+
+  # Validations
+  validates :title, presence: true
 
 end

data/test/dummy/config/application.rb

@@ -27,7 +27,8 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.default_locale = :en
+    config.i18n.available_locales = [:en, :nl]
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/test/dummy/config/locales/en.yml

@@ -1,5 +1,2 @@
-# 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:
   hello: "Hello world"

data/test/dummy/config/locales/nl.yml

@@ -0,0 +1,2 @@
+nl:
+  hello: "Hallo wereld"

data/test/dummy/db/migrate/20131121092946_make_articles_translatable.rb

@@ -0,0 +1,19 @@
+class MakeArticlesTranslatable < ActiveRecord::Migration
+  def up
+    change_table :articles do |t|
+      t.remove :title
+      t.remove :body
+    end
+
+    Article.create_translation_table!(title: :string, body: :text)
+  end
+
+  def down
+    change_table :articles do |t|
+      t.string :title
+      t.text :body
+    end
+
+    drop_table :article_translations
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20131113134503) do
+ActiveRecord::Schema.define(:version => 20131121092946) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -47,11 +47,21 @@ ActiveRecord::Schema.define(:version => 20131113134503) do
   add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true
   add_index "admin_users", ["reset_password_token"], :name => "index_admin_users_on_reset_password_token", :unique => true
 
-  create_table "articles", :force => true do |t|
+  create_table "article_translations", :force => true do |t|
+    t.integer  "article_id"
+    t.string   "locale"
     t.string   "title"
     t.text     "body"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+  end
+
+  add_index "article_translations", ["article_id"], :name => "index_article_translations_on_article_id"
+  add_index "article_translations", ["locale"], :name => "index_article_translations_on_locale"
+
+  create_table "articles", :force => true do |t|
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.string   "category"
   end
 

data/test/integration/aricles_test.rb

@@ -7,11 +7,11 @@ class ArticlesTest < ActionDispatch::IntegrationTest
   end
 
   test 'list articles' do
-    Article.create!(title: "Hello World")
+    article = Article.create!(title: "Hello World")
 
     click_on('Articles')
     assert_equal 200, page.status_code
-    assert page.has_text?('Hello World')
+    assert page.assert_selector('a.resource_id_link', text: article.id.to_s)
   end
 
   test 'create article' do
@@ -19,7 +19,7 @@ class ArticlesTest < ActionDispatch::IntegrationTest
     click_on('New Article')
     assert_equal('/lalala/articles/new', current_path)
 
-    fill_in('Title', with: 'My Article')
+    first('input[name="article[translations_writer][en][title]"]').set('My Article')
     attach_file('Image', File.expand_path('../../fixtures/files/image.png', __FILE__))
     click_on('Create Article')
     page.save_page

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.219
+  version: 4.0.0.dev.224
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1294,6 +1294,7 @@ files:
 - app/assets/images/lalala/icons/zoom.png
 - app/assets/images/lalala/icons/zoom_in.png
 - app/assets/images/lalala/icons/zoom_out.png
+- app/assets/images/lalala/overlay-logo.png
 - app/assets/images/lalala/users/default.jpg
 - app/assets/javascripts/browser/console.module.js
 - app/assets/javascripts/browser/document.module.js
@@ -1311,8 +1312,10 @@ files:
 - app/assets/javascripts/lalala/modules/calendar.module.js
 - app/assets/javascripts/lalala/modules/editor.module.js
 - app/assets/javascripts/lalala/modules/grid.module.js
+- app/assets/javascripts/lalala/modules/helpers.module.js
 - app/assets/javascripts/lalala/modules/init.module.js
 - app/assets/javascripts/lalala/modules/locale_chooser.module.js
+- app/assets/javascripts/lalala/modules/login.module.js
 - app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js
 - app/assets/javascripts/lalala/modules/storage.module.js
 - app/assets/stylesheets/lalala/_base.css.scss
@@ -1354,6 +1357,7 @@ files:
 - app/models/lalala/file_asset.rb
 - app/models/lalala/image_asset.rb
 - app/models/lalala/page.rb
+- app/views/active_admin/devise/sessions/new.html.erb
 - app/views/lalala/markdown/cheatsheet.html.erb
 - app/views/lalala/markdown/preview.html.erb
 - app/views/lalala/public/errors/internal_server_error.html.erb
@@ -1365,6 +1369,7 @@ files:
 - config/initializers/carrierwave.rb
 - config/initializers/database.rb
 - config/initializers/devise.rb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20130321140345_devise_create_admin_users.rb
 - db/migrate/20130321140351_create_admin_notes.rb
@@ -1421,6 +1426,7 @@ files:
 - lib/lalala/ext_i18n.rb
 - lib/lalala/ext_i18n/input_helper.rb
 - lib/lalala/ext_i18n/locale_source.rb
+- lib/lalala/ext_i18n/name_for_locale.rb
 - lib/lalala/ext_i18n/negotiation_adapter.rb
 - lib/lalala/ext_i18n/test_negotiation_adapter.rb
 - lib/lalala/ext_rack.rb
@@ -1501,11 +1507,13 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
+- test/dummy/config/locales/nl.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
 - test/dummy/db/migrate/20130528092721_create_articles.rb
 - test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
+- test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1544,7 +1552,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: 'Lalala: Probably the best CMS in the world.'
@@ -1592,11 +1600,13 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
+- test/dummy/config/locales/nl.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
 - test/dummy/db/migrate/20130528092721_create_articles.rb
 - test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
+- test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep