zen 0.2.7 → 0.2.8

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/form.xhtml

@@ -1,107 +1,113 @@
-<div class='tabs'>
-    <ul>
-        <li>
-            <a href="#general" title="#{lang('custom_fields.tabs.general')}">
-                #{lang('custom_fields.tabs.general')}
-            </a>
-        </li>
-        <li>
-            <a href="#settings" title="#{lang('custom_fields.tabs.settings')}">
-                #{lang('custom_fields.tabs.settings')}
-            </a>
-        </li>
-    </ul>
-</div>
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
 
-#{
-form_for(
-  @custom_field, :method => :post, :action => @form_save_url, :id => :custom_field_form
-) do |f|
+    <div class="tabs">
+        <ul>
+            <li>
+                <a href="#general"
+                title="#{lang('custom_fields.tabs.general')}">
+                    #{lang('custom_fields.tabs.general')}
+                </a>
+            </li>
+            <li>
+                <a href="#settings"
+                title="#{lang('custom_fields.tabs.settings')}">
+                    #{lang('custom_fields.tabs.settings')}
+                </a>
+            </li>
+        </ul>
+    </div>
 
-  f.input_hidden(:id, @custom_field.id)
-  f.input_hidden(:custom_field_group_id, @custom_field_group_id)
-  f.input_hidden(:csrf_token, get_csrf_token)
-  
-  f.g.div(:id => 'general') do
+    #{
+    form_for(
+      @custom_field,
+      :method => :post,
+      :action => CustomFields::Controller::CustomFields.r(:save),
+      :id     => :custom_field_form
+    ) do |f|
+      f.input_hidden(:id                   , @custom_field.id)
+      f.input_hidden(:custom_field_group_id, @custom_field_group_id)
+      f.input_hidden(:csrf_token           , get_csrf_token)
 
-    f.input_text(
-      lang('custom_fields.labels.name'),
-      :name
-    )
+      f.g.div(:id => 'general') do
+        f.input_text(
+          lang('custom_fields.labels.name'),
+          :name
+        )
 
-    f.input_text(
-      lang('custom_fields.labels.slug'),
-      :slug
-    )
-    
-    f.select(
-      lang('custom_fields.labels.type'),
-      :type, 
-      :values   => @field_type_hash, 
-      :size     => 1,
-      :selected => @custom_field.type
-    )
-    
-    f.select(
-      lang('custom_fields.labels.format'),
-      :format, 
-      :values   => Zen::Plugin::Markup::Engines, 
-      :size     => 1,
-      :selected => @custom_field.format
-    )
-  
-    f.textarea(
-      lang('custom_fields.labels.description'),
-      :description, 
-      :rows => 8
-    )
+        f.input_text(
+          lang('custom_fields.labels.slug'),
+          :slug
+        )
 
-    f.textarea(
-      lang('custom_fields.labels.possible_values'),
-      :possible_values, 
-      :rows => 8
-    )
-   
-  end
-  
-  f.g.div(:id => 'settings') do
+        f.select(
+          lang('custom_fields.labels.custom_field_type_id'),
+          :custom_field_type_id,
+          :values   => @custom_field_types,
+          :size     => 1,
+          :selected => @custom_field.custom_field_type_id
+        )
 
-    f.input_radio(
-      lang('custom_fields.labels.required'),
-      :required, 
-      @custom_field.required,
-      :values => @boolean_hash 
-    )
-      
-    f.input_radio(
-      lang('custom_fields.labels.visual_editor'),
-      :visual_editor, 
-      @custom_field.visual_editor,
-      :values => @boolean_hash
-    )
-      
-    f.input_text(
-      lang('custom_fields.labels.textarea_rows'),
-      :textarea_rows
-    )
-    
-    f.input_text(
-      lang('custom_fields.labels.text_limit'),
-      :text_limit
-    )
-    
-    f.input_text(
-      lang('custom_fields.labels.sort_order'),
-      :sort_order
-    )
+        f.select(
+          lang('custom_fields.labels.format'),
+          :format,
+          :values   => Zen::Plugin::Markup::Engines,
+          :size     => 1,
+          :selected => @custom_field.format
+        )
 
-  end
-  
-  f.g.div(:class => 'clearfix') do
-    f.g.div(:class => 'button') do
-      f.g.input(:type => 'submit', :value => lang('custom_fields.buttons.save'))
-    end
-  end
+        f.textarea(
+          lang('custom_fields.labels.description'),
+          :description,
+          :rows => 8
+        )
+
+        f.textarea(
+          lang('custom_fields.labels.possible_values'),
+          :possible_values,
+          :rows => 8
+        )
+      end
+
+      f.g.div(:id => 'settings') do
+        f.input_radio(
+          lang('custom_fields.labels.required'),
+          :required,
+          @custom_field.required,
+          :values => @boolean_hash.invert
+        )
+
+        f.input_radio(
+          lang('custom_fields.labels.text_editor'),
+          :text_editor,
+          @custom_field.text_editor,
+          :values => @boolean_hash.invert
+        )
 
-end
-}
+        f.input_text(
+          lang('custom_fields.labels.textarea_rows'),
+          :textarea_rows
+        )
+
+        f.input_text(
+          lang('custom_fields.labels.text_limit'),
+          :text_limit
+        )
+
+        f.input_text(
+          lang('custom_fields.labels.sort_order'),
+          :sort_order
+        )
+      end
+
+      f.g.div(:class => 'button') do
+        f.g.input(
+          :type  => 'submit',
+          :value => lang('custom_fields.buttons.save')
+        )
+      end
+    end
+    }
+</article>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/index.xhtml

@@ -2,83 +2,87 @@
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post"
+    action="#{CustomFields::Controller::CustomFields.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        <input type="hidden" name="custom_field_group_id" value="#{@custom_field_group_id}" />
-        
+        <input type="hidden" name="custom_field_group_id"
+        value="#{@custom_field_group_id}" />
+
         <?r if @custom_fields and !@custom_fields.empty? ?>
-        
-        <table class="table">
+
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
-                    
+
                     <th>#{lang('custom_fields.labels.id')}</th>
                     <th>#{lang('custom_fields.labels.name')}</th>
                     <th>#{lang('custom_fields.labels.slug')}</th>
-                    <th>#{lang('custom_fields.labels.type')}</th>
+                    <th>#{lang('custom_fields.labels.custom_field_type_id')}</th>
                     <th>#{lang('custom_fields.labels.format')}</th>
                 </tr>
             </thead>
-            
             <tbody>
                 <?r @custom_fields.each do |field| ?>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="custom_field_ids[]" value="#{field.id}" />
+                        <input type="checkbox" name="custom_field_ids[]"
+                        value="#{field.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{field.id}</td>
-                    
+
                     <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          field.name, 
-                          CustomFields::Controller::CustomFields.r(:edit, @custom_field_group_id, field.id), 
-                          :title => field.name
+                        #{CustomFields::Controller::CustomFields.a(
+                          field.name, :edit, @custom_field_group_id, field.id
                         )}
                     </td>
                     <?r else ?>
                     <td>#{field.name}</td>
                     <?r end ?>
-                    
+
                     <td>#{field.slug}</td>
-                    <td>#{lang("custom_fields.special.type_hash.#{field.type}")}</td>
+                    <td>#{@custom_field_types[field.custom_field_type_id]}</td>
                     <td>#{Zen::Plugin::Markup::Engines[field.format]}</td>
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @custom_fields.respond_to?(:navigation) \
+        and @custom_fields.page_count > 1
+          @custom_fields.navigation
+        end
+        }
+
         <?r else ?>
-        
         <p>#{lang('custom_fields.messages.no_fields')}</p>
-        
         <?r end ?>
-        
-        <div class="clearfix">
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('custom_fields.buttons.new'),
-                  CustomFields::Controller::CustomFields.r(:new, @custom_field_group_id)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @custom_fields and !@custom_fields.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('custom_fields.buttons.delete')}" />
-            </div>
-            <?r end ?>
-            
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{CustomFields::Controller::CustomFields.a(
+              lang('custom_fields.buttons.new'),
+              :new,
+              @custom_field_group_id
+            )}
         </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@custom_fields.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('custom_fields.buttons.delete')}" />
+        </div>
+        <?r end ?>
     </form>
 </article>

data/lib/zen/package/custom_fields/migrations/1295255665_create_schema.rb

@@ -11,27 +11,45 @@ Sequel.migration do
     create_table :custom_fields do
       primary_key :id
 
-      String    :name,                :null => false
-      String    :slug,                :null => false, :unique => true
-      String    :description,         :text => true
-      Integer   :sort_order,          :default  => 0
-      String    :type,                :null => false, :default => 'textbox'
-      String    :format,              :null => false, :default => 'plain'
-      String    :possible_values,     :text => true
+      String    :name,            :null => false
+      String    :slug,            :null => false, :unique => true
+      String    :description,     :text => true
+      Integer   :sort_order,      :default  => 0
+      String    :type,            :null => false, :default => 'textbox'
+      String    :format,          :null => false, :default => 'plain'
+      String    :possible_values, :text => true
       
       # Custom field settings
-      TrueClass :required,            :null => false, :default => false
-      TrueClass :visual_editor,       :null => false, :default => true
-      Integer   :textarea_rows,       :default => 10
+      TrueClass :required,      :null => false, :default => false
+      TrueClass :visual_editor, :null => false, :default => true
+      Integer   :textarea_rows, :default => 10
       Integer   :text_limit
       
-      foreign_key :custom_field_group_id, :custom_field_groups, :on_delete => :cascade,
-        :on_update => :cascade, :key => :id
+      foreign_key(
+        :custom_field_group_id, 
+        :custom_field_groups, 
+        :on_delete => :cascade,
+        :on_update => :cascade, 
+        :key       => :id
+      )
     end
     
     create_table :custom_field_groups_sections do
-      foreign_key :custom_field_group_id, :custom_field_groups, :on_delete => :cascade, :on_update => :cascade, :key => :id
-      foreign_key :section_id,            :sections,            :on_delete => :cascade, :on_update => :cascade, :key => :id
+      foreign_key(
+        :custom_field_group_id, 
+        :custom_field_groups, 
+        :on_delete => :cascade, 
+        :on_update => :cascade, 
+        :key => :id
+      )
+      
+      foreign_key(
+        :section_id, 
+        :sections, 
+        :on_delete => :cascade, 
+        :on_update => :cascade, 
+        :key       => :id
+      )
     end
     
     create_table :custom_field_values do
@@ -39,8 +57,21 @@ Sequel.migration do
     
       String  :value, :text  => true
       
-      foreign_key :custom_field_id,  :custom_fields,   :on_delete => :cascade, :on_update => :cascade, :key => :id
-      foreign_key :section_entry_id, :section_entries, :on_delete => :cascade, :on_update => :cascade, :key => :id
+      foreign_key(
+        :custom_field_id, 
+        :custom_fields,
+        :on_delete => :cascade,
+        :on_update => :cascade, 
+        :key       => :id
+      )
+      
+      foreign_key(
+        :section_entry_id,
+        :section_entries,
+        :on_delete => :cascade,
+        :on_update => :cascade, 
+        :key       => :id
+      )
     end
   end
   

data/lib/zen/package/custom_fields/migrations/1310659580_custom_field_types.rb

@@ -0,0 +1,148 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    rename_column(:custom_fields, :visual_editor, :text_editor)
+
+    create_table(:custom_field_methods) do
+      primary_key :id
+
+      String :name, :unique => true
+    end
+
+    # Insert all the possible methods.
+    Zen.database[:custom_field_methods].insert_multiple([
+      {:name => 'input_text'},
+      {:name => 'input_checkbox'},
+      {:name => 'input_radio'},
+      {:name => 'input_password'},
+      {:name => 'textarea'},
+      {:name => 'select'},
+      {:name => 'select_multiple'},
+    ])
+
+    create_table(:custom_field_types) do
+      primary_key :id
+
+      String    :name           , :null => false
+      String    :language_string, :null => false
+      String    :css_class
+
+      TrueClass :serialize   , :null => false, :default => false
+      TrueClass :allow_markup, :null => false, :default => false
+
+      foreign_key(
+        :custom_field_method_id,
+        :custom_field_methods,
+        :on_delete => :cascade,
+        :on_update => :cascade,
+        :key       => :id
+      )
+    end
+
+    # For some reason foreign keys didn't work for this column.
+    add_column(
+      :custom_fields,
+      :custom_field_type_id,
+      Integer,
+      :index => true
+    )
+
+    field_methods = {}
+
+    Zen.database[:custom_field_methods].each do |m|
+      field_methods[m[:name]] = m[:id]
+    end
+
+    default_types = [
+      {
+        :name                   => 'textbox',
+        :language_string        => 'custom_fields.special.type_hash.textbox',
+        :custom_field_method_id => field_methods['input_text']
+      },
+      {
+        :name                   => 'checkbox',
+        :language_string        => 'custom_fields.special.type_hash.checkbox',
+        :serialize              => true,
+        :custom_field_method_id => field_methods['input_checkbox']
+      },
+      {
+        :name                   => 'radio',
+        :language_string        => 'custom_fields.special.type_hash.radio',
+        :custom_field_method_id => field_methods['input_radio']
+      },
+      {
+        :name                   => 'password',
+        :language_string        => 'custom_fields.special.type_hash.password',
+        :custom_field_method_id => field_methods['input_password']
+      },
+      {
+        :name                   => 'textarea',
+        :language_string        => 'custom_fields.special.type_hash.textarea',
+        :allow_markup           => true,
+        :custom_field_method_id => field_methods['textarea'],
+        :css_class              => 'text_editor'
+      },
+      {
+        :name                   => 'select',
+        :language_string        => 'custom_fields.special.type_hash.select',
+        :custom_field_method_id => field_methods['select']
+      },
+      {
+        :name                   => 'select_multiple',
+        :language_string        => 'custom_fields.special.type_hash.select_multiple',
+        :serialize              => true,
+        :custom_field_method_id => field_methods['select_multiple']
+      },
+      {
+        :name                   => 'date',
+        :language_string        => 'custom_fields.special.type_hash.date',
+        :custom_field_method_id => field_methods['input_text'],
+        :css_class              => 'date'
+      }
+    ]
+
+    # Insert the default fields
+    Zen.database[:custom_field_types].insert_multiple(default_types)
+
+    field_types = {}
+
+    Zen.database[:custom_field_types].each do |t|
+      field_types[t[:name]] = t[:id]
+    end
+
+    # Replace the text values with the correct IDs
+    Zen.database[:custom_fields].each do |field|
+      Zen.database[:custom_fields].filter(:id => field[:id]).update(
+        :custom_field_type_id => field_types[field[:type]]
+      )
+    end
+
+    # Drop the text based column now that all the data has been migrated.
+    drop_column(:custom_fields, :type)
+  end
+
+  # Reverts the changes made in the up() block.
+  down do
+    rename_column(:custom_fields, :text_editor, :visual_editor)
+
+    types  = {}
+    fields = Zen.database[:custom_fields].all
+
+    Zen.database[:custom_field_types].each do |type|
+      types[type[:id]] = type[:name]
+    end
+
+    # Put the string based fields type back in place
+    add_column(:custom_fields, :type, String)
+
+    fields.each do |field|
+      Zen.database[:custom_fields].filter(:id => field[:id]).update(
+        :type => types[field[:custom_field_type_id]]
+      )
+    end
+
+    drop_column(:custom_fields, :custom_field_type_id)
+    drop_table(:custom_field_types)
+    drop_table(:custom_field_methods)
+  end
+end