refinerycms-formtastic 1.0.1 → 1.0.2

data/app/assets/stylesheets/refinery/formtastic/admin.css.scss

@@ -1,4 +1,11 @@
 .formtastic {
+  .button, .action {
+    float: none;
+    padding: 0 14px 3px 14px;
+    font-size: 14px;
+    margin: 0;
+  }
+
   .input {
     .label {
       float: none;

data/app/assets/stylesheets/refinery/formtastic/admin_base.css.scss

@@ -0,0 +1,266 @@
+/* -------------------------------------------------------------------------------------------------
+
+It's *strongly* suggested that you don't modify this file.  Instead, load a new stylesheet after
+this one in your layouts (eg formtastic_changes.css) and override the styles to suit your needs.
+This will allow you to update formtastic.css with new releases without clobbering your own changes.
+
+This stylesheet forms part of the Formtastic Rails Plugin
+(c) 2008-2011 Justin French
+
+--------------------------------------------------------------------------------------------------*/
+
+/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
+--------------------------------------------------------------------------------------------------*/
+.formtastic {
+  margin:0;
+  padding:0;
+
+  ul,
+  ol,
+  li,
+  fieldset,
+  legend,
+  input,
+  button,
+  textarea,
+  select,
+  p {
+    margin:0;
+    padding:0;
+  }
+
+  fieldset {
+    border:0;
+  }
+
+  em,
+  strong {
+    font-style:normal;
+    font-weight:normal;
+  }
+
+  ol,
+  ul {
+    list-style:none;
+  }
+
+  abbr,
+  acronym {
+    border:0;
+    font-variant:normal;
+  }
+
+  legend {
+    white-space:normal;
+    color:#000;
+  }
+
+
+  /* SEMANTIC ERRORS
+  --------------------------------------------------------------------------------------------------*/
+  .errors {
+    color:#cc0000;
+    margin:0.5em 0 1.5em 25%;
+    list-style:square;
+  }
+
+  .errors li {
+    padding:0;
+    border:none;
+    display:list-item;
+  }
+
+  /* INPUTS
+  --------------------------------------------------------------------------------------------------*/
+  .inputs {
+    overflow:hidden; /* clear containing floats */
+
+    input,
+    button,
+    textarea {
+      font-family:sans-serif;
+      font-size:inherit;
+      font-weight:inherit;
+    }
+
+    input,
+    textarea,
+    select {
+      font-size:100%;
+    }
+
+    .input {
+      overflow:hidden; /* clear containing floats */
+      padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
+      margin-top:-0.5em;
+      margin-bottom:1em;
+    }
+
+    /* LEFT ALIGNED LABELS
+    --------------------------------------------------------------------------------------------------*/
+    .input .label {
+      display:block;
+      width:25%;
+      float:left;
+      padding-top:.2em;
+    }
+
+    .fragments .label,
+    .choices .label {
+      position:absolute;
+      width:95%;
+      left:0px;
+    }
+
+    .fragments .label label,
+    .choices .label label {
+      position:absolute;
+    }
+
+    /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
+    --------------------------------------------------------------------------------------------------*/
+    .choices {
+      position:relative;
+    }
+
+    .choices-group {
+      float:left;
+      width:74%;
+      margin:0;
+      padding:0 0 0 25%;
+    }
+
+    .choice {
+      padding:0;
+      border:0;
+    }
+
+
+    /* INLINE HINTS
+    --------------------------------------------------------------------------------------------------*/
+    .input .inline-hints {
+      color:#666;
+      margin:0.5em 0 0 25%;
+    }
+
+
+    /* INLINE ERRORS
+    --------------------------------------------------------------------------------------------------*/
+    .inline-errors {
+      color:#cc0000;
+      margin:0.5em 0 0 25%;
+    }
+
+    .errors {
+      color:#cc0000;
+      margin:0.5em 0 0 25%;
+      list-style:square;
+    }
+
+    .errors li {
+      padding:0;
+      border:none;
+      display:list-item;
+    }
+
+
+    /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
+    --------------------------------------------------------------------------------------------------*/
+    .stringish input {
+      width:72%;
+    }
+
+    .stringish input[size] {
+      width:auto;
+      max-width:72%;
+    }
+
+
+    /* TEXTAREA OVERRIDES
+    --------------------------------------------------------------------------------------------------*/
+    .text textarea {
+      width:72%;
+    }
+
+    .text textarea[cols] {
+      width:auto;
+      max-width:72%;
+    }
+
+
+    /* HIDDEN OVERRIDES
+    --------------------------------------------------------------------------------------------------*/
+    .hidden {
+      display:none;
+    }
+
+
+    /* BOOLEAN LABELS
+    --------------------------------------------------------------------------------------------------*/
+    .boolean label {
+      padding-left:25%;
+      display:block;
+    }
+
+
+    /* CHOICE GROUPS
+    --------------------------------------------------------------------------------------------------*/
+    .choices-group {
+      margin-bottom:-0.5em;
+    }
+
+    .choice {
+      margin:0.1em 0 0.5em 0;
+    }
+
+    .choice label {
+      float:none;
+      width:100%;
+      line-height:100%;
+      padding-top:0;
+      margin-bottom:0.6em;
+    }
+
+
+    /* ADJUSTMENTS FOR INPUTS INSIDE LABELS (boolean input, radio input, check_boxes input)
+    --------------------------------------------------------------------------------------------------*/
+    .choice label input,
+    .boolean label input {
+      margin:0 0.3em 0 0.1em;
+      line-height:100%;
+    }
+
+
+    /* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
+    --------------------------------------------------------------------------------------------------*/
+    .fragments {
+      position:relative;
+    }
+
+    .fragments-group {
+      float:left;
+      width:74%;
+      margin:0;
+      padding:0 0 0 25%;
+    }
+
+    .fragment {
+      float:left;
+      width:auto;
+      margin:0 .3em 0 0;
+      padding:0;
+      border:0;
+    }
+
+    .fragment label {
+      display:none;
+    }
+
+    .fragment label input {
+      display:inline;
+      margin:0;
+      padding:0;
+    }
+  }
+}
+

data/app/helpers/refinery/formtastic/page_tabs_helper.rb

@@ -53,9 +53,10 @@ module Refinery
 
         def editor_only_fieldset_body(form, tab)
           content_tag(:div, :class => 'page_part', :id => tab.to_s) do
-            form.inputs do
-              form.input tab, :as => :wymeditor
-            end
+            form.text_area tab, :rows => 20, :class => 'wymeditor widest'
+            # form.inputs do
+            #  form.input tab, :as => :wymeditor
+            # end
           end
         end
 
@@ -68,4 +69,3 @@ module Refinery
   end
 end
 
-Refinery::AdminController.send(:helper, 'refinery/formtastic/page_tabs')

data/lib/refinery/formtastic/engine.rb

@@ -1,10 +1,17 @@
 module Refinery
   module Formtastic
     class Engine < Rails::Engine
+      include Refinery::Engine
       isolate_namespace Refinery::Formtastic
+      engine_name :refinery_formtastic
+
+      before_inclusion do
+        Refinery::AdminController.send :helper, Refinery::Pages::ContentPagesHelper
+        Refinery::AdminController.send(:helper, Refinery::Formtastic::PageTabsHelper)
+      end
 
       config.after_initialize do
-        Refinery::Core.config.register_stylesheet("formtastic")
+        Refinery::Core.config.register_stylesheet("refinery/formtastic/admin_base")
         Refinery::Core.config.register_stylesheet("refinery/formtastic/admin")
         require 'refinery/formtastic/extensions/page_tab'
         require 'refinery/formtastic/page_tabs_helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-formtastic
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
-  requirement: &70150134720260 !ruby/object:Gem::Requirement
+  requirement: &70305888636900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70150134720260
+  version_requirements: *70305888636900
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70150134719740 !ruby/object:Gem::Requirement
+  requirement: &70305888635480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70150134719740
+  version_requirements: *70305888635480
 - !ruby/object:Gem::Dependency
   name: refinerycms-testing
-  requirement: &70150134719260 !ruby/object:Gem::Requirement
+  requirement: &70305888634060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *70150134719260
+  version_requirements: *70305888634060
 description: A rails engine which allows the use of Formtastic in the RefineryCMS
   backend.
 email: craig@craigambrose.com
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/assets/stylesheets/refinery/formtastic/admin.css.scss
+- app/assets/stylesheets/refinery/formtastic/admin_base.css.scss
 - app/helpers/refinery/formtastic/page_tabs_helper.rb
 - app/inputs/wymeditor_input.rb
 - config/locales/en.yml