contour 2.1.0.beta3 → 2.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a385dbea9ef8095dfc4f2b38b1d0e0ed7c151e40
-  data.tar.gz: 41d9a5cdb061ad01ea8b2bc6010b14da6b62a6f7
+  metadata.gz: 36e3d400211a3141a9e8e6d5a53228b02b5e21a3
+  data.tar.gz: fa1def185d99ca806dbd1cbccf6da6fd1331a08c
 SHA512:
-  metadata.gz: 2caba4af7dbb7c11430481e7c0666958c9c68e970d1fe8dfab8483839a672d13f2c61f4c56cb5f0ee8b82680f9cd40a34ba7500318889a846de22aa3ed107ce9
-  data.tar.gz: fc322df7ee8ab8f7a2315e40dccf00d204bc69033ba9a9ece472c92bb3a2e44f0bf912a7054c1729a9b86e446a38e77229f1450ed05cf7843c8c60ec97b24c53
+  metadata.gz: c8ec19d295c87e11e1aef31af382951b8b3c60480813a344e5aca854742984ef26021e4aaffc578ed2060fe56c681c260feeaba954f30c7f406261d7d41f42a3
+  data.tar.gz: 132b0388bea6e9046ec6cbe59f1f57d9dd313c3307520b37e1b63a162882d4821380b975ebea76ead44be24a4eb42afd6f79f092fb0eaa1c1eede8c878438b98

data/app/assets/stylesheets/bootstrap-overrides.css

@@ -94,3 +94,7 @@ dt, dd {
 .form-inline input[type="password"] {
   width: 180px;
 }
+
+.radio, .checkbox {
+  min-height: 35px;
+}

data/app/assets/stylesheets/bootstrap/bs-callout.css

@@ -0,0 +1,31 @@
+/* Base styles (regardless of theme) */
+.bs-callout {
+  margin: 20px 0;
+  padding: 15px 30px 15px 15px;
+  border-left: 5px solid #eee;
+}
+.bs-callout h4 {
+  margin-top: 0;
+  font-weight: 500;
+}
+.bs-callout p:last-child {
+  margin-bottom: 0;
+}
+.bs-callout code,
+.bs-callout .highlight {
+  background-color: #fff;
+}
+
+/* Themes for different contexts */
+.bs-callout-danger {
+  background-color: #fcf2f2;
+  border-color: #dFb5b4;
+}
+.bs-callout-warning {
+  background-color: #fefbed;
+  border-color: #f1e7bc;
+}
+.bs-callout-info {
+  background-color: #f0f7fd;
+  border-color: #d0e3f0;
+}

data/app/assets/stylesheets/contour.css

@@ -4,6 +4,7 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require bootstrap/v3.0.0-rc1/bootstrap
+ *= require bootstrap/bs-callout
  *= require glyphicons
  *= require bootstrap-overrides
  *= require twitter-bootstrap/bootstrap-scroll-modal

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 1
     TINY = 0
-    BUILD = "beta3" # nil, "pre", "rc", "rc2"
+    BUILD = "beta4" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/generators/contour/scaffold/templates/_form.html.erb

@@ -4,8 +4,8 @@
 
 <%%= form_for @<%= resource_name %>, html: { class: 'form-horizontal' } do |f| %>
   <%% if @<%= resource_name %>.errors.any? %>
-    <div id="error_explanation">
-      <h2><%%= pluralize(@<%= resource_name %>.errors.count, "error") %> prohibited this <%= resource_name %> from being saved:</h2>
+    <div id="error_explanation" class="bs-callout bs-callout-danger">
+      <h4><%%= pluralize(@<%= resource_name %>.errors.count, "error") %> prohibited this <%= resource_name %> from being saved</h4>
 
       <ul>
       <%% @<%= resource_name %>.errors.full_messages.each do |msg| %>
@@ -16,22 +16,25 @@
   <%% end %>
 
   <%- columns.each do |column| -%>
-  <div class="control-group">
-    <%%= f.label :<%= column.name %>, nil, class: 'control-label' %>
-    <div class="controls">
+  <div class="form-group">
+    <%%= f.label :<%= column.name %>, nil, class: 'col-lg-2 control-label' %>
+    <div class="col-lg-10">
       <%- if column.name.split('_').last == 'id' -%>
-      <%%= f.select :<%= column.name %>, [['---', nil]] + <%= column.name.split('_')[0..-2].join('_').camelize %>.current.collect{|<%= column.name.first %>| [<%= column.name.first %>.name, <%= column.name.first %>.id]} %>
+      <%%= f.select :<%= column.name %>, [['---', nil]] + <%= column.name.split('_')[0..-2].join('_').camelize %>.current.collect{|<%= column.name.first %>| [<%= column.name.first %>.name, <%= column.name.first %>.id]}, {}, class: 'form-control' %>
       <%- elsif column.field_type == :date_select -%>
-      <%%= f.text_field :<%= column.name %>, class: 'datepicker', value: @<%= resource_name %>.<%= column.name %> ? @<%= resource_name %>.<%= column.name %>.strftime('%m/%d/%Y') : '' %>
+      <%%= f.text_field :<%= column.name %>, class: 'datepicker form-control', value: @<%= resource_name %>.<%= column.name %> ? @<%= resource_name %>.<%= column.name %>.strftime('%m/%d/%Y') : '' %>
       <%- else -%>
-      <%%= f.<%= column.field_type %> :<%= column.name %><%= ", rows: 7, style: 'width:95%'" if column.field_type == :text_area %> %>
+      <%%= f.<%= column.field_type %> :<%= column.name %><%= ", rows: 7, style: 'width:95%'" if column.field_type == :text_area %>, class: 'form-control' %>
       <%- end -%>
     </div>
   </div>
 
   <%- end -%>
-  <div class="form-actions">
-    <%%= f.submit nil, class: 'btn btn-primary' %>
-    <%%= cancel %>
+
+  <div class="form-group">
+    <div class="col-lg-10 col-offset-2">
+      <%%= f.submit nil, class: 'btn btn-primary' %>
+      <%%= cancel %>
+    </div>
   </div>
 <%% end %>

data/lib/generators/contour/scaffold/templates/show.html.erb

@@ -1,10 +1,9 @@
-<%% @title = "<%= resource_title %>: #{@<%= resource_name %>.name}" %>
+<%% @title = @<%= resource_name %>.name %>
 <div class="page-header">
   <h1>
-    <%%= @title %>
+    <%%= link_to "<%= resource_title_plural %>", <%= resource_name_plural %>_path, class: 'btn btn-mini' %> &middot; <%%= @title %>
     <%%= link_to "Edit <%= resource_title %>", edit_<%= resource_name %>_path(@<%= resource_name %>), class: 'btn btn-mini' %>
     <%%= link_to "Delete <%= resource_title %>", @<%= resource_name %>, method: :delete, class: 'btn btn-mini btn-danger', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{@<%= resource_name %>.name}?" } %>
-    <%%= link_to "View <%= resource_title_plural %>", <%= resource_name_plural %>_path, class: 'btn btn-mini' %>
   </h1>
 </div>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta3
+  version: 2.1.0.beta4
 platform: ruby
 authors:
 - Remo Mueller
@@ -229,6 +229,7 @@ files:
 - app/assets/javascripts/external/typeahead.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
+- app/assets/stylesheets/bootstrap/bs-callout.css
 - app/assets/stylesheets/bootstrap/v3.0.0-rc1/bootstrap.css
 - app/assets/stylesheets/bootstrap-overrides.css
 - app/assets/stylesheets/contour/about.css