lalala 4.0.0.dev.416 → 4.1.0.dev.299

data/app/assets/stylesheets/lalala/modules/_file-uploader-metadata.css.scss

@@ -0,0 +1,118 @@
+/*
+
+  Modules / File uploader metadata
+
+*/
+
+.mod-file-uploader-metadata {
+  background: white;
+  height: 100%;
+  position: relative;
+
+  //
+  //  Main
+  //
+  .main {
+    margin-right: 220px + 2 * 29px;
+    padding: 30px 29px;
+  }
+
+  .main .fields {
+    ul, ol {
+      list-style: none;
+    }
+
+    .label {
+      color: #6C6C6E;
+      font-size: 13px;
+      text-transform: lowercase;
+    }
+
+    .input {
+      margin-bottom: 6px;
+    }
+
+    .input:after {
+      clear: both;
+      content: ".";
+      display: block;
+      height: 0;
+      visibility: hidden;
+    }
+
+    .input input[type="checkbox"] {
+      display: inline-block;
+      margin: 0 9px 0 0;
+      position: relative;
+      top: -1px;
+      width: auto;
+    }
+
+    .chosen-container {
+      margin-top: 6px;
+    }
+  }
+
+  //
+  //  Sidebar
+  //
+  .sidebar {
+    border-left: 1px solid #E0E0E0;
+    bottom: 0;
+    padding: 30px 29px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 220px;
+  }
+
+  .sidebar .image.cover {
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    height: 153px;
+    width: 220px;
+  }
+
+  .sidebar .image img {
+    display: block;
+    width: 100%;
+  }
+
+  .sidebar .meta {
+    color: #A2A2A2;
+    font-size: 12px;
+    font-weight: bold;
+    margin-bottom: 40px;
+    text-align: right;
+
+    -webkit-font-smoothing: antialiased;
+
+    .row {
+      border-bottom: 1px solid #E0E0E0;
+      height: 39px;
+      line-height: 38px;
+      overflow: hidden;
+      position: relative;
+      white-space: nowrap;
+    }
+
+    .label {
+      color: #DFDFDF;
+      left: 0;
+      position: absolute;
+      top: 0;
+    }
+  }
+
+  .sidebar .actions a {
+    display: block;
+    height: 40px;
+    line-height: 42px;
+    margin-bottom: 10px;
+    padding-bottom: 0;
+    padding-top: 0;
+  }
+
+
+}

data/app/assets/stylesheets/lalala/modules/_file-uploader.css.scss

@@ -0,0 +1,289 @@
+/*
+
+  Modules / File uploader
+
+*/
+
+x-files {
+  color: #6F6F71;
+  display: block;
+  font-size: 12px;
+  line-height: 18px;
+  margin-bottom: 45px;
+  margin-top: 19px;
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+
+  .x-file-form {
+    display: none;
+  }
+
+  //
+  //  Header
+  //
+  header {
+    font-weight: bold;
+
+    &, .col-a, .col-b {
+      height: 38px;
+      overflow: hidden;
+    }
+
+    .col-a, .col-b {
+      line-height: 38px;
+      position: relative;
+    }
+  }
+
+  // column a - left
+  header .col-a {
+    border-right: 1px solid #E2E2E2;
+    float: left;
+    width: 40%;
+    width: -webkit-calc(40% - 1px);
+    width: calc(40% - 1px);
+
+    .name {
+      padding-left: 4px;
+    }
+
+    .choose {
+      @include icon("folder_add");
+      background-position: left center;
+      color: #CDCDCD;
+      cursor: pointer;
+      line-height: 24px;
+      padding-left: 22px;
+      padding-top: 2px;
+      position: absolute;
+      right: 14px;
+      top: 5px;
+    }
+
+    .choose:hover {
+      color: #6F6F71;
+    }
+  }
+
+  // column b - right
+  header .col-b {
+    float: right;
+    width: 60%;
+
+    .data-inspection {
+      color: #CDCDCD;
+      padding-right: 4px;
+      position: absolute;
+      right: 0;
+      top: 0;
+    }
+  }
+
+  //
+  //  File container
+  //
+  .file-container {
+    border: 1px solid #e2e2e2;
+    border-radius: 4px;
+    overflow: hidden;
+  }
+
+  .file-container .inner-wrapper {
+    margin-bottom: -1px;
+    overflow: hidden;
+  }
+
+  //
+  //  X-file
+  //
+  x-file {
+    border: 1px solid #e2e2e2;
+    border-top: 0;
+    border-left: 0;
+    cursor: pointer;
+    display: block;
+    float: left;
+    height: 110px;
+    padding: 18px 8px 62px;
+    position: relative;
+    width: 158px;
+  }
+
+  x-file.about-to-destroy {
+    background-color: rgba(red, .1);
+  }
+
+  //
+  //  X-file -- General
+  //
+  x-file .thumb {
+    background-color: #F3F3F3;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    height: 110px;
+    width: 100%;
+  }
+
+  x-file .thumb.no-image {
+    background-image: icon-url("page_white");
+    background-size: auto;
+  }
+
+  x-file .title {
+    color: #A0A0A0;
+    font-weight: bold;
+    left: 8px;
+    line-height: 14px;
+    overflow: hidden;
+    position: absolute;
+    right: 8px;
+    text-overflow: ellipsis;
+    top: 138px;
+    white-space: nowrap;
+  }
+
+  x-file canvas,
+  x-file img {
+    display: block;
+    opacity: 0.5;
+
+    @include transition(
+      opacity 450ms
+    );
+  }
+
+  x-file .attributes,
+  x-file .meta {
+    display: none;
+  }
+
+  //
+  //  X-file -- Menu
+  //
+  x-file .menu {
+    display: none;
+
+    a {
+      background-position: center;
+      cursor: pointer;
+      display: inline-block;
+      height: 16px;
+      margin: 9px 5px 0 0;
+      width: 16px;
+
+      -webkit-filter: grayscale(90%);
+
+      @include transition-duration(450ms);
+      @include transition-property(-webkit-filter);
+    }
+
+    a:hover,
+    a:active,
+    a:focus {
+      -webkit-filter: grayscale(0%);
+    }
+
+    [data-action="delete"] { @include icon("delete"); }
+    [data-action="meta"] { @include icon("information"); }
+    [data-action="move"] { @include icon("crosshair"); }
+  }
+
+  x-file.saved-to-db,
+  x-file.uploaded { &:hover .menu {
+    display: block;
+  }}
+
+  //
+  //  X-file -- Status bar
+  //
+  x-file .status-bar {
+    background-color: #e2e2e2;
+    bottom: 12px;
+    left: 8px;
+    right: 8px;
+
+    &, > div {
+      height: 1px;
+      position: absolute;
+    }
+
+    > div {
+      left: 0;
+      top: 0;
+    }
+  }
+
+  x-file .status-bar .upload-bar {
+    background-color: #FFC914;
+    box-shadow: 0 0 9px rgba(#FFC914, .75);
+    z-index: 1;
+  }
+
+  x-file .status-bar .process-bar {
+    background-color: #36F269;
+    box-shadow: 0 0 9px rgba(#36F269, .75);
+    z-index: 2;
+  }
+
+  //
+  //  X-file statusses
+  //
+  x-file.waiting .title:after {
+    content: "Waiting...";
+  }
+
+  x-file.uploading .title:after {
+    content: "Uploading...";
+  }
+
+  x-file.processing .title:after {
+    content: "Processing...";
+  }
+
+  x-file.uploaded canvas,
+  x-file.uploaded img {
+    opacity: 1;
+  }
+
+  x-file.uploaded .status-bar {
+    display: none;
+  }
+
+  x-file.error {
+    .status-bar {
+      background-color: $red;
+    }
+
+    .upload-bar,
+    .process-bar {
+      display: none;
+    }
+  }
+
+
+  //
+  //  FC -> Empty message
+  //
+  .is-empty {
+    color: #DEDEDE;
+    font-size: 24px;
+    font-weight: bold;
+    height: 190px;
+    line-height: 190px;
+    text-align: center;
+  }
+
+  .is-empty .message {
+    display: inline-block;
+    line-height: 26px;
+    vertical-align: middle;
+  }
+
+
+}

data/app/assets/stylesheets/lalala/modules/_media-selector.css.scss

@@ -0,0 +1,113 @@
+.mod-media-selector {
+  background-color: white;
+  height: 100%;
+  position: relative;
+
+  //
+  //  Header
+  //
+  header {
+    border-bottom: 1px solid #e0e0e0;
+    height: 69px;
+    position: relative;
+  }
+
+  header .data-selection {
+    font-size: 21px;
+    font-weight: bold;
+    line-height: 72px;
+    padding: 0 22px;
+  }
+
+  header .close {
+    color: black;
+    cursor: pointer;
+    font-size: 22px;
+    height: 28px;
+    line-height: 32px;
+    margin-top: -14px;
+    position: absolute;
+    right: 40px;
+    top: 50%;
+  }
+
+  //
+  //  Sidebar
+  //
+  aside {
+    border-left: 1px solid #e0e0e0;
+    bottom: 0;
+    padding: 28px;
+    position: absolute;
+    right: 0;
+    top: 70px;
+    width: 279px - 2 * 28px;
+
+    // actions
+    .actions a {
+      display: block;
+      margin-bottom: 11px;
+    }
+
+    // options
+    .options {
+      margin-top: 29px;
+    }
+
+    .options .options-title {
+      color: #aaa;
+      font-size: 12px;
+      font-weight: bold;
+      margin-bottom: 9px;
+      text-transform: uppercase;
+    }
+
+    .options select {
+      @include box-sizing(border-box);
+      width: 100%;
+    }
+  }
+
+  //
+  //  Main
+  //
+  section {
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 280px;
+    top: 70px;
+  }
+
+  .asset-container {
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  .asset-container .asset {
+    border-bottom: 1px solid #e0e0e0;
+    border-right: 1px solid #e0e0e0;
+    cursor: pointer;
+    float: left;
+    padding: 14px;
+
+    &.selected {
+      background-color: rgba($button_green, .25);
+    }
+  }
+
+  .asset-container .asset .image {
+    background-color: #eee;
+    background-position: center;
+    background-size: cover;
+    height: 110px;
+    width: 158px;
+  }
+
+  .asset-container .asset.selected .image {
+    background-color: rgba($button_green, .75);
+  }
+
+
+}

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

@@ -92,20 +92,3 @@
   }
 
 }
-
-
-//
-// Hide new button from header on edit views
-//
-.active_admin.edit {
-
-  #title_bar {
-
-    #titlebar_right {
-
-      .action_item a[href$=new] {
-        display: none;
-      }
-    }
-  }
-}

data/app/controllers/lalala/public/errors_controller.rb

@@ -1,6 +1,7 @@
 class Lalala::Public::ErrorsController < ApplicationController
 
   helper_method :current_exception
+  before_filter :capture_current_exception
 
   # 404 - Not Found
   def not_found
@@ -23,4 +24,10 @@ private
     @current_exception ||= env["action_dispatch.exception"]
   end
 
+  def capture_current_exception
+    if defined?(::Raven) && ENV['SENTRY_DSN']
+      Raven.capture_exception(current_exception)
+    end
+  end
+
 end

data/app/models/lalala/page.rb

@@ -251,7 +251,6 @@ private
         _locale = I18n.locale
 
         I18n.available_locales.each do |locale|
-          next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
           I18n.locale = locale
 
           translated_attrs.each do |attr|

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

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

data/config/routes.rb

@@ -1,5 +1,8 @@
 Rails.application.routes.draw do
 
+  #
+  #  Active Admin & Devise
+  #
   if (ActiveAdmin rescue nil)
     ActiveAdmin.routes(self)
     if (AdminUser rescue nil)
@@ -7,8 +10,16 @@ Rails.application.routes.draw do
     end
   end
 
-  get  '/lalala/markdown/cheatsheet', to: 'lalala/markdown#cheatsheet'
 
+  #
+  #  Other
+  #
+  get '/lalala/markdown/cheatsheet', to: 'lalala/markdown#cheatsheet'
+
+
+  #
+  #  Errors
+  #
   if (ErrorsController rescue nil)
     match '/404', to: 'errors#not_found'
     match '/422', to: 'errors#unprocessable_entity'

data/lalala-assets.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'lalala',               Lalala::BUILD_VERSION
   gem.add_runtime_dependency 'coffee-rails',         '= 3.2.2'
   gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
-  gem.add_runtime_dependency 'compass',              '= 1.0.0.alpha.19'
-  gem.add_runtime_dependency 'compass-rails',        '= 1.1.7'
-  gem.add_runtime_dependency 'sass',                 '= 3.3.4'
+  gem.add_runtime_dependency 'compass',              '= 0.13.alpha.0'
+  gem.add_runtime_dependency 'compass-rails',        '= 1.0.3'
+  gem.add_runtime_dependency 'sass',                 '= 3.2.14'
   gem.add_runtime_dependency 'sass-rails',           '= 3.2.6'
   gem.add_runtime_dependency 'sprockets-commonjs',   '= 0.0.5'
   gem.add_runtime_dependency 'uglifier',             '= 1.3.0'

data/lalala-development.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'lalala',               Lalala::BUILD_VERSION
   gem.add_runtime_dependency 'lalala-assets',        Lalala::BUILD_VERSION
   gem.add_runtime_dependency 'pry-rails',            '> 0'
-  gem.add_runtime_dependency 'sqlite3',              '> 1'
+  gem.add_runtime_dependency 'sqlite3',              '> 0'
 
 end

data/lalala-test.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'lalala',      Lalala::BUILD_VERSION
   gem.add_runtime_dependency 'capybara',    "> 0"
   gem.add_runtime_dependency 'poltergeist', "> 0"
-  gem.add_runtime_dependency 'sqlite3',     '> 1'
+  gem.add_runtime_dependency 'sqlite3',     '> 0'
 
 end

data/lalala.gemspec

@@ -30,8 +30,7 @@ Gem::Specification.new do |gem|
 
 
   # generic
-  gem.add_runtime_dependency 'activeadmin',               '= 0.6.3'
-  gem.add_runtime_dependency 'carrierwave',               '= 0.8.0'
+  gem.add_runtime_dependency 'activeadmin',               '= 0.6.2'
   gem.add_runtime_dependency 'closure_tree',              '= 3.10.2'
   gem.add_runtime_dependency 'country-select',            '= 1.1.1'
   gem.add_runtime_dependency 'dalli',                     '= 2.6.3'
@@ -40,13 +39,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'i18n-country-translations', '= 0.0.9'
   gem.add_runtime_dependency 'jquery-rails',              '= 2.2.1'
   gem.add_runtime_dependency 'meta_search',               '= 1.1.3'
-  gem.add_runtime_dependency 'mini_magick',               '= 3.6.0'
   gem.add_runtime_dependency 'pg',                        '= 0.17.1'
-  gem.add_runtime_dependency 'puma',                      '= 2.14.0'
+  gem.add_runtime_dependency 'puma',                      '= 2.0.1'
   gem.add_runtime_dependency 'rails',                     '= 3.2.16'
   gem.add_runtime_dependency 'rails-i18n',                '= 0.7.3'
   gem.add_runtime_dependency 'redcarpet',                 '= 2.3.0'
   gem.add_runtime_dependency 'stringex',                  '= 1.5.1'
-  gem.add_runtime_dependency 'rails_12factor',            '= 0.0.3'
+  gem.add_runtime_dependency 'sentry-raven',              '= 0.6.0'
+  gem.add_runtime_dependency 'haraway',                   '~> 0.1.0.dev'
 
 end

data/lib/formtastic/form_builder_ext.rb

@@ -0,0 +1,10 @@
+module Formtastic
+  class FormBuilder
+
+    def input(method, options = {}, &block)
+      options[:block] = block if block_given?
+      super(method, options)
+    end
+
+  end
+end