manifest-rails 0.2.3 → 0.2.4

data/app/assets/javascripts/manifest/main.js

@@ -4,9 +4,26 @@
 //= require_tree .
 
 $(function() {
+  $.fn.touchBind = function(fn) {
+    $(this).live('click', function() {
+      return fn.call(this);
+    })
+
+    $(this).live('touchmove', function() {
+      $(this).addClass('dragged');
+    });
+
+    $(this).live('touchend', function() {
+      if (!$(this).hasClass('dragged')) fn.call(this);
+      $(this).removeClass('dragged');
+    });
+
+    return this;
+  }
+
   $('.tinymce').tinymce({});
 
-  $('#content_block_allow_html').change(function() {
+  $('#content_block_allow_html').live('change', function() {
     if ($(this).is(':checked')) {
       $('#content_block_content').tinymce({});
     } else {
@@ -17,12 +34,15 @@ $(function() {
   })
 
   $(".nav-select").change(function() {
-    window.location = $(this).find("option:selected").val();
+    $.pjax({
+      url: $(this).find('option:selected').val(),
+      container: '.app-content'
+    })
   });
 
   $('a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax('.app-content', { timeout: 10000 });
 
-  $('tbody tr').live('click', function() {
+  $('tbody tr').touchBind(function() {
     controller = $(this).parent().parent().attr('id').split(':').pop();
     id = $(this).attr('id').split('_').pop();
 

data/app/assets/stylesheets/manifest/_forms.css.scss

@@ -18,6 +18,13 @@ textarea {
   height: $base;
   padding: $base / 4;
   @include box-shadow(0 1px 1px rgba(0,0,0,0.1) inset, 0 1px 0 white);
+
+  @media screen and (max-width: 480px) {
+    width: 100%;
+    height: $base + $base / 2;
+    display: block;
+    @include box-sizing(border-box);
+  }
 }
 
 textarea {
@@ -58,4 +65,9 @@ textarea {
     position: absolute;
     left: -24px;
   }
+
+  @media screen and (max-width: 480px) {
+    width: 100%;
+    @include box-sizing(border-box);
+  }
 }

data/app/assets/stylesheets/manifest/_tables.css.scss

@@ -1,39 +1,52 @@
-table { margin-bottom: $base; }
-
-thead {
-  border: 1px solid darken(#36c, 13.5);
-  border-bottom: none;
-}
-
-th, td {
-  padding: $base / 4 $base / 2;
+table.resource_table {
+  margin-bottom: $base;
+  
+  @media screen and (max-width: 480px) {
+    width: 100%;
+  }
+
+  thead {
+    border: 1px solid darken(#36c, 13.5);
+    border-bottom: none;
+  }
+
+  th, td {
+    padding: $base / 4 $base / 2;
+
+    &.minor {
+      @media screen and (max-width: 480px) {
+        display: none;
+      }
+    }
+  }
+
+  th {
+    background: #36c;
+    @include background(linear-gradient(#36c, darken(#36c, 6.75)));
+    @include box-shadow(0 -1px 0 darken(#36c, 27) inset);
+    color: #fff;
+  }
+
+  tr:first-child td { @include box-shadow(0 1px 0 #f8f8f8 inset); }
+
+  tr:nth-child(odd) {
+    background: #e8e8e8;
+  }
+
+  tr:nth-child(even) {
+    background: #fff;
+  }
+
+  tbody tr:hover {
+    background: lighten($accent, 10);
+    background: $accent;
+    cursor: pointer;
+    color: white;
+  }
+
+  tbody {
+    border: 1px solid #ccc;
+    border-top: none;
+  }
 }
 
-th {
-  background: #36c;
-  @include background(linear-gradient(#36c, darken(#36c, 6.75)));
-  @include box-shadow(0 -1px 0 darken(#36c, 27) inset);
-  color: #fff;
-}
-
-tr:first-child td { @include box-shadow(0 1px 0 #f8f8f8 inset); }
-
-tr:nth-child(odd) {
-  background: #e8e8e8;
-}
-
-tr:nth-child(even) {
-  background: #fff;
-}
-
-tbody tr:hover {
-  background: lighten($accent, 10);
-  background: $accent;
-  cursor: pointer;
-  color: white;
-}
-
-tbody {
-  border: 1px solid #ccc;
-  border-top: none;
-}

data/app/views/manifest/content_blocks/_form.html.erb

@@ -1,16 +1,4 @@
-<% if @content_block.errors.any? %>
-  <div class='form-errors'>
-    <h3>Whoops!</h3>
-
-    <p>Please correct the following errors:</p>
-
-    <ul>
-      <% @content_block.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-    </ul>
-  </div><!-- form-errors -->
-<% end %>
+<%= render 'manifest/shared/form_error_list', object: @content_block %>
 
 <%= form_for [:manifest, @content_block], builder: Manifest::LabelledFormBuilder do |f| %>
   <% if current_editor.admin? %>

data/app/views/manifest/content_blocks/index.html.erb

@@ -1,12 +1,12 @@
 <h2>Content Blocks</h2>
 
 <% if @content_blocks.count > 0 %>
-  <table id='table:<%= controller_name %>'>
+  <table id='table:<%= controller_name %>' class='resource_table'>
     <thead>
       <th>Title</th>
       <th>Page</th>
-      <th>Created</th>
-      <th>Updated</th>
+      <th class='minor'>Created</th>
+      <th class='minor'>Updated</th>
     </thead>
 
     <tbody>
@@ -14,8 +14,8 @@
         <%= content_tag_for(:tr, c) do %>
           <td><%= c.title %></td>
           <td><%= c.page.title %></td>
-          <td><%= c.created_at.to_s(:short) %></td>
-          <td><%= c.updated_at.to_s(:short) %></td>
+          <td class='minor'><%= c.created_at.to_s(:short) %></td>
+          <td class='minor'><%= c.updated_at.to_s(:short) %></td>
         <% end %>
       <% end %>
     </tbody>

data/app/views/manifest/pages/_form.html.erb

@@ -1,16 +1,4 @@
-<% if @page.errors.any? %>
-  <div class='form-errors'>
-    <h3>Whoops!</h3>
-
-    <p>Please correct the following errors:</p>
-
-    <ul>
-      <% @page.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-    </ul>
-  </div><!-- form-errors -->
-<% end %>
+<%= render 'manifest/shared/form_error_list', object: @page %>
 
 <%= form_for [:manifest, @page], builder: Manifest::LabelledFormBuilder do |f| %>
   <%= f.text_field :title %>

data/app/views/manifest/pages/show.html.erb

@@ -3,19 +3,19 @@
 <h3>Content Blocks</h3>
 
 <% if @page.content_blocks.count > 0 %>
-  <table id='table:content_blocks'>
+  <table id='table:content_blocks' class='resource_table'>
     <thead>
       <th>Title</th>
-      <th>Created</th>
-      <th>Updated</th>
+      <th class='minor'>Created</th>
+      <th class='minor'>Updated</th>
     </thead>
 
     <tbody>
       <% @page.content_blocks.each do |c| %>
         <%= content_tag_for(:tr, c) do %>
           <td><%= c.title %></td>
-          <td><%= c.created_at.to_s(:short) %></td>
-          <td><%= c.updated_at.to_s(:short) %></td>
+          <td class='minor'><%= c.created_at.to_s(:short) %></td>
+          <td class='minor'><%= c.updated_at.to_s(:short) %></td>
         <% end %>
       <% end %>
     </tbody>

data/app/views/manifest/shared/_form_error_list.html.erb

@@ -0,0 +1,13 @@
+<% if object.errors.any? %>
+  <div class='form-errors'>
+    <h3>Whoops!</h3>
+
+    <p>Please correct the following errors:</p>
+
+    <ul>
+      <% object.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/lib/generators/manifest/data_type/templates/_form.html.erb

@@ -1,3 +1,5 @@
+<%%= render 'manifest/shared/form_error_list', object: @<%= name.underscore %> %>
+
 <%%= form_for [:manifest, @<%= name.underscore %>], builder: Manifest::LabelledFormBuilder do |f| %>
   <% attributes.each do |attribute| %>
     <% if [:integer, :decimal, :float, :string].include?(attribute.type) %>

data/lib/generators/manifest/data_type/templates/index.html.erb

@@ -1,7 +1,7 @@
 <h2><%= table_name %></h2>
 
 <%% if @<%= table_name %>.count > 0 %>
-<table id='table:<%%= controller_name %>'>
+<table id='table:<%%= controller_name %>' class='resource_table'>
   <thead>
     <% attributes.each do |attribute| -%>
       <th><%= attribute.name.humanize %></th>

data/lib/manifest/version.rb

@@ -1,3 +1,3 @@
 module Manifest
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manifest-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70348846821520 !ruby/object:Gem::Requirement
+  requirement: &70327481984300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348846821520
+  version_requirements: *70327481984300
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70348846818440 !ruby/object:Gem::Requirement
+  requirement: &70327481983820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348846818440
+  version_requirements: *70327481983820
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70348846812800 !ruby/object:Gem::Requirement
+  requirement: &70327481983120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70348846812800
+  version_requirements: *70327481983120
 - !ruby/object:Gem::Dependency
   name: compass-rails
-  requirement: &70348846805960 !ruby/object:Gem::Requirement
+  requirement: &70327481982640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348846805960
+  version_requirements: *70327481982640
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70348846803880 !ruby/object:Gem::Requirement
+  requirement: &70327481982040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348846803880
+  version_requirements: *70327481982040
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &70348846801280 !ruby/object:Gem::Requirement
+  requirement: &70327481981580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348846801280
+  version_requirements: *70327481981580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70348846795340 !ruby/object:Gem::Requirement
+  requirement: &70327481981100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348846795340
+  version_requirements: *70327481981100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70348846793900 !ruby/object:Gem::Requirement
+  requirement: &70327481980640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348846793900
+  version_requirements: *70327481980640
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70348846792860 !ruby/object:Gem::Requirement
+  requirement: &70327481980140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348846792860
+  version_requirements: *70327481980140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70348846791800 !ruby/object:Gem::Requirement
+  requirement: &70327481979660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348846791800
+  version_requirements: *70327481979660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348846789840 !ruby/object:Gem::Requirement
+  requirement: &70327481979120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348846789840
+  version_requirements: *70327481979120
 description: Manifest allows for the creation of simple content management with support
   for easy custom data types. It attempts to preserve the Rails way of working where
   possible.
@@ -169,6 +169,7 @@ files:
 - app/views/manifest/pages/new.html.erb
 - app/views/manifest/pages/show.html.erb
 - app/views/manifest/sessions/new.html.erb
+- app/views/manifest/shared/_form_error_list.html.erb
 - config/initializers/manifest.rb
 - config/routes.rb
 - db/migrate/20120303200114_create_pages.rb
@@ -214,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3388462568342458365
+      hash: 3770417001256903588
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3388462568342458365
+      hash: 3770417001256903588
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17