scrivito_two_column_widget 0.90.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 845d11abbf10b57027ea1b65a11b577219eeb8d3
-  data.tar.gz: a7fa1e2dec3232dc755e85ba4da9344b2370b9fd
+  metadata.gz: b0d5c4ed1a3c3148a8625fe58c20be0f2ba9c344
+  data.tar.gz: 3c40819e31b9a24f673e3d3d6d2a396fda67d0b3
 SHA512:
-  metadata.gz: afdc8b6b6e5c9e2efff5c611f2a009f66515ca70acca7653ed073915aa55d239017b6954876c5dcdcb95f7c9a9f6f58b4d48db16574969113f9053e5fa168618
-  data.tar.gz: bb73e74f96c2c775e5caccab606a240c38a00dbfe80968b3658063d8acdcdd9e4e623d2a3797bd0e05a3659e0ffe87c04714d6ab61d391ea7ee00ae43f4c9b29
+  metadata.gz: 8700fa0887a6ae159ac6630eadb70ef1a7864149cfd66ba93fe989e249d062832a578c1954554fcf2053d3db7f8b5ab21b819d60e04418593e51ed485f88b2c9
+  data.tar.gz: 9d684f14889a8646438ea45eb5546ceef1aaeaddeb9e380448df8faa79054ed1dae222d6d7955fb8281ebac5fbbf502007274bed5b310093fc4bc7da142f5e51

data/README.md

@@ -1,17 +1,33 @@
-# Scrivito Two Columns
+# ScrivitoTwoColumnWidget
 
-This Gem adds a two-column grid widget to your Scrivito app. You can fill both columns with other widgets.
+This gem adds a Scrivito widget for dividing pages and page sections into two columns to your app.
 
 ## Prerequisites
 
-Use Bootstrap in your Rails App.
+Requires Bootstrap in your Rails App.
 
 ## Installation
 
-Add the gem to your Gemfile:
+Add this line to your application's Gemfile:
 
     gem 'scrivito_two_column_widget'
 
 ## Customization
 
-We recomment to use [Scrivito Advanced Editors](https://github.com/Scrivito/scrivito_advanced_editors) for best usability.
+We recommend to use [Scrivito Advanced Editors](https://github.com/Scrivito/scrivito_advanced_editors) which provides nicer controls.
+
+## Localization
+
+The following code represents the default localization for English. Copy it to your `en.yml` and change it if necessary:
+
+```yaml
+en:
+  scrivito_two_column_widget:
+    thumbnail:
+      title: Two Columns
+      description: Two columns that can be filled with widgets
+    details:
+      column_1_width: Width for column 1
+      grid_size: Gird Size
+      keep_columns: Show columns on mobile
+```

data/app/assets/stylesheets/scritivo_two_column_widget.scss

@@ -0,0 +1,39 @@
+.scrivito-column-widget.small-grid {
+  margin-left: 0;
+  margin-right: 0;
+  .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1,
+  .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2,
+  .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3,
+  .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4,
+  .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5,
+  .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6,
+  .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7,
+  .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8,
+  .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9,
+  .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10,
+  .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11,
+  .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
+}
+
+.scrivito-column-widget.large-grid {
+  margin-left: -30px;
+  margin-right: -30px;
+  .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1,
+  .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2,
+  .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3,
+  .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4,
+  .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5,
+  .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6,
+  .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7,
+  .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8,
+  .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9,
+  .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10,
+  .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11,
+  .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+    padding-left: 30px;
+    padding-right: 30px;
+  }
+}

data/app/models/two_column_widget.rb

@@ -2,9 +2,23 @@ class TwoColumnWidget < Widget
   attribute :column_1, :widgetlist
   attribute :column_2, :widgetlist
   attribute :column_1_width, :enum, values: (1..12).to_a.map {|e| e.to_s}, default: '6'
+  attribute :grid_size, :enum, values: ['small','default','large'], default: 'default'
+  attribute :keep_columns, :enum, values: ['Yes','No'], default: 'No'
 
   def column_2_width
+    val = column_2_width_value
+    val < 1 ? 1 : val
+  end
+
+  def column_2_width_value
     12 - self.column_1_width.to_i
   end
 
+  def grid_size_class
+    "#{grid_size || 'default'}-grid"
+  end
+
+  def device_class
+    keep_columns == 'Yes' ? 'xs' : 'md'
+  end
 end

data/app/views/two_column_widget/details.html.erb

@@ -1,3 +1,14 @@
 <%= scrivito_details_for 'column 1' do %>
   <%= scrivito_tag(:div, widget, :column_1_width) %>
-<% end %>
+<% end %>
+<%= scrivito_details_for t('scrivito_two_column_widget.details.column_1_width', default: 'Width for column 1') do %>
+  <%= scrivito_tag(:div, widget, :column_1_width) %>
+<% end %>
+
+<%= scrivito_details_for t('scrivito_two_column_widget.details.grid_size', default: 'Grid Size') do %>
+  <%= scrivito_tag(:div, widget, :grid_size) %>
+<% end %>
+
+<%= scrivito_details_for t('scrivito_two_column_widget.details.keep_columns', default: 'Show columns on mobile') do %>
+  <%= scrivito_tag(:div, widget, :keep_columns) %>
+<% end %>

data/app/views/two_column_widget/show.html.erb

@@ -1,9 +1,9 @@
-<div class="row">
-  <div class="col-md-<%= widget.column_1_width %>">
-    <%= scrivito_tag(:div, widget, :column_1, class: 'list_item') %>
+<div class="scrivito-column-widget row <%= widget.grid_size_class %>">
+  <div class="col-<%= widget.device_class %>-<%= widget.column_1_width %>">
+    <%= scrivito_tag(:div, widget, :column_1) %>
   </div>
 
-  <div class="col-md-<%= widget.column_2_width %>">
-    <%= scrivito_tag(:div, widget, :column_2, class: 'list_item') %>
+  <div class="col-<%= widget.device_class %>-<%= widget.column_2_width %>">
+    <%= scrivito_tag(:div, widget, :column_2) %>
   </div>
 </div>

data/app/views/two_column_widget/thumbnail.html.erb

@@ -1,3 +1,3 @@
-<%= scrivito_thumbnail 'Two Columns', image_tag("scrivito_two_column_widget/widget_preview_2cols.png") do %>
-  Two columns that can be filled with widgets.
+<%= scrivito_thumbnail t('scrivito_two_column_widget.thumbnail.title', default: 'Three Coumns'), image_tag("scrivito_two_column_widget/widget_preview_2cols.png") do %>
+  <%= t('scrivito_two_column_widget.thumbnail.description', default: 'Two columns that can be filled with widgets') %>
 <% end %>

data/lib/scrivito_two_column_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoTwoColumnWidget
-  VERSION = "0.90.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_two_column_widget
 version: !ruby/object:Gem::Version
-  version: 0.90.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito
@@ -35,6 +35,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/scrivito_two_column_widget/widget_preview_2cols.png
+- app/assets/stylesheets/scritivo_two_column_widget.scss
 - app/models/two_column_widget.rb
 - app/views/two_column_widget/details.html.erb
 - app/views/two_column_widget/show.html.erb