Fixing up whitespace on all the .haml files

This commit is contained in:
Jacques Crocker 2010-07-23 16:57:18 -07:00
parent 0d7d059736
commit f566861a10
10 changed files with 28 additions and 28 deletions

View File

@ -6,7 +6,7 @@
= f.input :name = f.input :name
= f.input :slug = f.input :slug
= f.input :description = f.input :description
= render 'admin/custom_fields/index', :form => f, :collection_name => 'contents' = render 'admin/custom_fields/index', :form => f, :collection_name => 'contents'
- unless f.object.new_record? - unless f.object.new_record?
@ -18,5 +18,5 @@
= f.input :order_by, :as => :select, :collection => options_for_order_by(f.object, 'contents'), :include_blank => false = f.input :order_by, :as => :select, :collection => options_for_order_by(f.object, 'contents'), :include_blank => false
= f.custom_input :api_enabled, :css => 'toggle' do = f.custom_input :api_enabled, :css => 'toggle' do
= f.check_box :api_enabled = f.check_box :api_enabled

View File

@ -3,7 +3,7 @@
- content_for :submenu do - content_for :submenu do
= render 'admin/shared/menu/contents' = render 'admin/shared/menu/contents'
- content_for :buttons do - content_for :buttons do
= admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit' = admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit'
= admin_button_tag t('admin.contents.index.new'), new_admin_content_url(@content_type.slug), :class => 'new' = admin_button_tag t('admin.contents.index.new'), new_admin_content_url(@content_type.slug), :class => 'new'

View File

@ -2,25 +2,25 @@
- content_for :submenu do - content_for :submenu do
= render 'admin/shared/menu/contents' = render 'admin/shared/menu/contents'
- content_for :head do - content_for :head do
= javascript_include_tag 'admin/contents' = javascript_include_tag 'admin/contents'
- content_for :buttons do - content_for :buttons do
= admin_button_tag :edit, edit_admin_content_type_url(@content_type), :class => 'edit' = admin_button_tag :edit, edit_admin_content_type_url(@content_type), :class => 'edit'
= admin_button_tag :new, new_admin_content_url(@content_type.slug), :class => 'new' = admin_button_tag :new, new_admin_content_url(@content_type.slug), :class => 'new'
- if @content_type.description.present? - if @content_type.description.present?
%p= @content_type.description %p= @content_type.description
- if @content_type.groupable? - if @content_type.groupable?
- @contents.each do |group| - @contents.each do |group|
%h3= group[:name] || t('.category_noname') %h3= group[:name] || t('.category_noname')
= render 'list', :contents => group[:items] = render 'list', :contents => group[:items]
%br %br
- else - else
= render 'list', :contents => @contents = render 'list', :contents => @contents
= form_tag sort_admin_contents_path(@content_type.slug), :method => :put, :class => 'formtastic' do = form_tag sort_admin_contents_path(@content_type.slug), :method => :put, :class => 'formtastic' do
= hidden_field_tag :order = hidden_field_tag :order

View File

@ -3,26 +3,26 @@
= stylesheet_link_tag 'admin/page_parts' = stylesheet_link_tag 'admin/page_parts'
= f.foldable_inputs :name => :information do = f.foldable_inputs :name => :information do
= f.input :title = f.input :title
= f.input :layout_id, :as => :select, :collection => current_site.layouts.all.to_a, :input_html => { :data_url => admin_layout_page_parts_url('_id_to_replace_') } = f.input :layout_id, :as => :select, :collection => current_site.layouts.all.to_a, :input_html => { :data_url => admin_layout_page_parts_url('_id_to_replace_') }
- if not @page.index? and not @page.not_found? - if not @page.index? and not @page.not_found?
= f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false = f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false
= f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized?}" } = f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized?}" }
= f.custom_input :templatized, :css => 'toggle' do = f.custom_input :templatized, :css => 'toggle' do
= f.check_box :templatized = f.check_box :templatized
= f.input :content_type_id, :as => :select, :collection => current_site.content_types.all.to_a, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized?}" } = f.input :content_type_id, :as => :select, :collection => current_site.content_types.all.to_a, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized?}" }
= f.custom_input :published, :css => 'toggle' do = f.custom_input :published, :css => 'toggle' do
= f.check_box :published = f.check_box :published
= f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false
#page-parts #page-parts
.nav .nav
- @page.parts.each_with_index do |part, index| - @page.parts.each_with_index do |part, index|

View File

@ -12,6 +12,6 @@
%p.link %p.link
= link_to t('.link'), new_admin_password_path = link_to t('.link'), new_admin_password_path
.footer .footer
= login_button_tag t('admin.buttons.login') = login_button_tag t('admin.buttons.login')

View File

@ -6,10 +6,10 @@
- elsif defined?(delete_button) - elsif defined?(delete_button)
= delete_button = delete_button
   
.span-12.last .span-12.last
%p %p
%button.button.light{ :type => 'submit' } %button.button.light{ :type => 'submit' }
%span= button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label %span= button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label
.clear .clear

View File

@ -7,7 +7,7 @@
= stylesheet_link_tag 'admin/blueprint/screen', :media => 'screen' = stylesheet_link_tag 'admin/blueprint/screen', :media => 'screen'
/ [if IE] / [if IE]
= stylesheet_link_tag 'admin/blueprint/ie', :media => 'screen' = stylesheet_link_tag 'admin/blueprint/ie', :media => 'screen'
= stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/menu', 'admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku? = stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/menu', 'admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku? = javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?

View File

@ -9,7 +9,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
@pages.each do |page| @pages.each do |page|
if not page.index_or_not_found? if not page.index_or_not_found?
if page.templatized? if page.templatized?
page.content_type.contents.visible.each do |c| page.content_type.contents.visible.each do |c|
xml.url do xml.url do
xml.loc page_main_url(page, c) xml.loc page_main_url(page, c)

View File

@ -5,10 +5,10 @@
= f.inputs :name => :information do = f.inputs :name => :information do
= f.input :name = f.input :name
= f.input :slug, :required => false = f.input :slug, :required => false
= f.inputs :name => :code do = f.inputs :name => :code do
= f.custom_input :value, :css => 'full', :with_label => false do = f.custom_input :value, :css => 'full', :with_label => false do
%code{ :class => 'html' } %code{ :class => 'html' }
= f.text_area :value = f.text_area :value
.more .more
= link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link' = link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link'

View File

@ -3,11 +3,11 @@
%html{ :xmlns => 'http://www.w3.org/1999/xhtml' } %html{ :xmlns => 'http://www.w3.org/1999/xhtml' }
%head %head
%title= escape_once("#{Locomotive.config.name} — #{current_site.name}") %title= escape_once("#{Locomotive.config.name} — #{current_site.name}")
= stylesheet_link_tag 'admin/blueprint/screen', 'admin/login', :media => 'screen', :cache => Rails.env.production? && !Locomotive.config.heroku = stylesheet_link_tag 'admin/blueprint/screen', 'admin/login', :media => 'screen', :cache => Rails.env.production? && !Locomotive.config.heroku
/ [if IE] / [if IE]
= stylesheet_link_tag('admin/blueprint/ie', :media => 'screen') = stylesheet_link_tag('admin/blueprint/ie', :media => 'screen')
%body %body
#wrapper #wrapper
#light.container #light.container