zen 0.3 → 0.4

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

@@ -1,98 +1,98 @@
 <section>
-    #{render_search_form(
-      ::CustomFields::Controller::CustomFieldTypes.r(:index)
-    )}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
+
+        #{render_search_form(
+          ::CustomFields::Controller::CustomFieldTypes.r(:index)
+        )}
     </header>
 
-    <form action="#{CustomFields::Controller::CustomFieldTypes.r(:delete)}"
-    method="post">
-        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+    <div class="body">
+        <form action="#{CustomFields::Controller::CustomFieldTypes.r(:delete)}"
+        method="post">
+            <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
-        <?r if !@field_types.empty? ?>
+            <?r if !@field_types.empty? ?>
 
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_custom_field_type) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_custom_field_type) ?>
+                        <th class="no_sort">
+                            <input type="checkbox" />
+                        </th>
+                        <?r end ?>
 
-                    <th>#{lang('custom_field_types.labels.id')}</th>
-                    <th>#{lang('custom_field_types.labels.name')}</th>
-                    <th>#{lang('custom_field_types.labels.language_string')}</th>
-                    <th>#{lang('custom_field_types.labels.html_class')}</th>
-                    <th>#{lang('custom_field_types.labels.serialize')}</th>
-                    <th>#{lang('custom_field_types.labels.allow_markup')}</th>
-                    <th>
-                        #{lang(
-                          'custom_field_types.labels.custom_field_method_id'
-                        )}
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <?r @field_types.each do |type| ?>
-                <tr>
-                    <?r if user_authorized?(:delete_custom_field_type) ?>
-                    <td>
-                        <input type="checkbox" name="custom_field_type_ids[]"
-                        id="custom_field_type_#{type.id}" value="#{type.id}" />
-                    </td>
-                    <?r end ?>
+                        <th>#{lang('custom_field_types.labels.id')}</th>
+                        <th>#{lang('custom_field_types.labels.name')}</th>
+                        <th>
+                            #{lang('custom_field_types.labels.language_string')}
+                        </th>
+                        <th>#{lang('custom_field_types.labels.html_class')}</th>
+                        <th>#{lang('custom_field_types.labels.serialize')}</th>
+                        <th>
+                            #{lang('custom_field_types.labels.allow_markup')}
+                        </th>
+                        <th>
+                            #{lang(
+                              'custom_field_types.labels.custom_field_method_id'
+                            )}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?r @field_types.each do |type| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete_custom_field_type) ?>
+                        <td>
+                            <input type="checkbox" name="custom_field_type_ids[]"
+                            id="custom_field_type_#{type.id}" value="#{type.id}" />
+                        </td>
+                        <?r end ?>
 
-                    <td>#{type.id}</td>
-                    <td>
-                        #{if user_authorized?(:edit_custom_field_type)
-                          CustomFields::Controller::CustomFieldTypes.a(
-                            type.name,
-                            :edit,
-                            type.id
-                          )
-                        else
-                          type.name
-                        end}
-                    </td>
-                    <td>#{type.language_string}</td>
-                    <td>#{type.html_class}</td>
-                    <td>#{@boolean_hash[type.serialize]}</td>
-                    <td>#{@boolean_hash[type.allow_markup]}</td>
-                    <td>#{type.custom_field_method.name}</td>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
+                        <td>#{type.id}</td>
+                        <td>
+                            #{if user_authorized?(:edit_custom_field_type)
+                              edit_link(
+                                CustomFields::Controller::CustomFieldTypes.r(
+                                  :edit,
+                                  type.id
+                                ),
+                                type.name
+                              )
+                            else
+                              type.name
+                            end}
+                        </td>
+                        <td>#{type.language_string}</td>
+                        <td>#{type.html_class}</td>
+                        <td>#{@boolean_hash[type.serialize]}</td>
+                        <td>#{@boolean_hash[type.allow_markup]}</td>
+                        <td>#{type.custom_field_method.name}</td>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
 
-        #{if @field_types.respond_to?(:navigation) \
-        and @field_types.page_count > 1
-          @field_types.navigation
-        end}
+            #{render_pagination(@field_types)}
 
-        <?r else ?>
+            <?r else ?>
 
-        <p>#{lang('custom_field_types.messages.no_field_types')}</p>
+            <p>#{lang('custom_field_types.messages.no_field_types')}</p>
 
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:new_custom_field_type) ?>
-        <div class="button">
-            #{CustomFields::Controller::CustomFieldTypes.a(
-              lang('custom_field_types.buttons.new'),
-              :new
+            <?r if user_authorized?(:new_custom_field_type) ?>
+            #{new_button(
+              CustomFields::Controller::CustomFieldTypes.r(:new),
+              lang('custom_field_types.buttons.new')
             )}
-        </div>
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:delete_custom_field_type) \
-        and !@field_types.empty? ?>
-        <div class="button">
-            <input type="submit"
-            value="#{lang('custom_field_types.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:delete_custom_field_type) \
+            and !@field_types.empty? ?>
+            #{delete_button(lang('custom_field_types.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>

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

@@ -6,13 +6,13 @@
     <div class="tabs">
         <ul>
             <li>
-                <a href="#general"
+                <a href="#general" class="icon edit"
                 title="#{lang('custom_fields.tabs.general')}">
                     #{lang('custom_fields.tabs.general')}
                 </a>
             </li>
             <li>
-                <a href="#settings"
+                <a href="#settings" class="icon settings"
                 title="#{lang('custom_fields.tabs.settings')}">
                     #{lang('custom_fields.tabs.settings')}
                 </a>
@@ -20,99 +20,102 @@
         </ul>
     </div>
 
-    #{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)
+    <div class="body">
+        #{form_for(
+          @custom_field,
+          :method => :post,
+          :action => CustomFields::Controller::CustomFields.r(:save),
+          :id     => :custom_field_form,
+          :'data-autosave-url' => CustomFields::Controller::CustomFields \
+            .r(:autosave)
+        ) 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.g.div(:id => 'general') do
-        f.input_text(
-          lang('custom_fields.labels.name'),
-          :name,
-          :required  => :required,
-          :maxlength => 255
-        )
+          f.g.div(:id => 'general') do
+            f.input_text(
+              lang('custom_fields.labels.name'),
+              :name,
+              :required  => :required,
+              :maxlength => 255
+            )
 
-        f.input_text(
-          lang('custom_fields.labels.slug'),
-          :slug,
-          :maxlength => 255
-        )
+            f.input_text(
+              lang('custom_fields.labels.slug'),
+              :slug,
+              :maxlength => 255
+            )
 
-        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,
-          :required => :required
-        )
+            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,
+              :required => :required
+            )
 
-        f.select(
-          lang('custom_fields.labels.format'),
-          :format,
-          :values   => ::Zen::Markup.to_hash,
-          :size     => 1,
-          :selected => @custom_field.format
-        )
+            f.select(
+              lang('custom_fields.labels.format'),
+              :format,
+              :values   => ::Zen::Markup.to_hash,
+              :size     => 1,
+              :selected => @custom_field.format
+            )
 
-        f.textarea(
-          lang('custom_fields.labels.description'),
-          :description,
-          :rows => 8
-        )
+            f.textarea(
+              lang('custom_fields.labels.description'),
+              :description,
+              :rows => 8
+            )
 
-        f.textarea(
-          lang('custom_fields.labels.possible_values'),
-          :possible_values,
-          :rows => 8
-        )
-      end
+            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.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
-        )
+            f.input_radio(
+              lang('custom_fields.labels.text_editor'),
+              :text_editor,
+              @custom_field.text_editor,
+              :values => @boolean_hash.invert
+            )
 
-        f.input_text(
-          lang('custom_fields.labels.textarea_rows'),
-          :textarea_rows,
-          :pattern => '\\\d*'
-        )
+            f.input_text(
+              lang('custom_fields.labels.textarea_rows'),
+              :textarea_rows,
+              :pattern => '\\\d*'
+            )
 
-        f.input_text(
-          lang('custom_fields.labels.text_limit'),
-          :text_limit,
-          :pattern => '\\\d*'
-        )
+            f.input_text(
+              lang('custom_fields.labels.text_limit'),
+              :text_limit,
+              :pattern => '\\\d*'
+            )
 
-        f.input_text(
-          lang('custom_fields.labels.sort_order'),
-          :sort_order,
-          :pattern => '\\\d*'
-        )
-      end
+            f.input_text(
+              lang('custom_fields.labels.sort_order'),
+              :sort_order,
+              :pattern => '\\\d*'
+            )
+          end
 
-      f.g.div(:class => 'button') do
-        f.g.input(
-          :type  => 'submit',
-          :value => lang('custom_fields.buttons.save')
-        )
-      end
-    end}
+          f.g.input(
+            :type  => 'submit',
+            :value => lang('custom_fields.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>

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

@@ -1,98 +1,101 @@
 <section>
-    #{render_search_form(
-      ::CustomFields::Controller::CustomFields.r(:index, @custom_field_group_id)
-    )}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
+
+        #{render_search_form(
+          CustomFields::Controller::CustomFields.r(
+            :index,
+            @custom_field_group_id
+          )
+        )}
     </header>
 
-    <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}" />
+    <div class="body">
+        <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}" />
 
-        <?r if !@custom_fields.empty? ?>
+            <?r if !@custom_fields.empty? ?>
 
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_custom_field) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_custom_field) ?>
+                        <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.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_custom_field) ?>
-                    <td>
-                        <input type="checkbox" name="custom_field_ids[]"
-                        value="#{field.id}" />
-                    </td>
-                    <?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.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_custom_field) ?>
+                        <td>
+                            <input type="checkbox" name="custom_field_ids[]"
+                            value="#{field.id}" />
+                        </td>
+                        <?r end ?>
 
-                    <td>#{field.id}</td>
+                        <td>#{field.id}</td>
 
-                    <td>
-                        #{if user_authorized?(:edit_custom_field)
-                          CustomFields::Controller::CustomFields.a(
-                            field.name,
-                            :edit,
-                            @custom_field_group_id,
-                            field.id
-                          )
-                        else
-                          field.name
-                        end}
-                    </td>
+                        <td>
+                            #{if user_authorized?(:edit_custom_field)
+                              edit_link(
+                                CustomFields::Controller::CustomFields.r(
+                                  :edit,
+                                  @custom_field_group_id,
+                                  field.id
+                                ),
+                                field.name
+                              )
+                            else
+                              field.name
+                            end}
+                        </td>
 
-                    <td>#{field.slug}</td>
-                    <td>#{@custom_field_types[field.custom_field_type_id]}</td>
-                    <td>#{Zen::Markup.to_hash[field.format]}</td>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
+                        <td>#{field.slug}</td>
+                        <td>
+                            #{@custom_field_types[field.custom_field_type_id]}
+                        </td>
+                        <td>#{Zen::Markup.to_hash[field.format]}</td>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
 
-        #{if @custom_fields.respond_to?(:navigation) \
-        and @custom_fields.page_count > 1
-          @custom_fields.navigation
-        end}
+            #{render_pagination(@custom_fields)}
 
-        <?r else ?>
+            <?r else ?>
 
-        <p>#{lang('custom_fields.messages.no_fields')}</p>
+            <p>#{lang('custom_fields.messages.no_fields')}</p>
 
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:new_custom_field) ?>
-        <div class="button">
-            #{CustomFields::Controller::CustomFields.a(
-              lang('custom_fields.buttons.new'),
-              :new,
-              @custom_field_group_id
+            <?r if user_authorized?(:new_custom_field) ?>
+            #{new_button(
+              CustomFields::Controller::CustomFields.r(
+                :new,
+                @custom_field_group_id
+              ),
+              lang('custom_fields.buttons.new')
             )}
-        </div>
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:delete_custom_field) \
-        and !@custom_fields.empty? ?>
-        <div class="button">
-            <input type="submit"
-            value="#{lang('custom_fields.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:delete_custom_field) \
+            and !@custom_fields.empty? ?>
+            #{delete_button(lang('custom_fields.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>