final-hamlized everything

app/views/admin/taxons/_taxon_table.html.haml

@@ -6,20 +6,17 @@
       %th
   %tbody
     - taxons.each do |taxon|
-    %tr{:id => dom_id(taxon, :sel)}
-      %td= taxon.name
-      %td= taxon_path taxon
-      %td.actions
-        = image_tag "spinner.gif", :style => "display:none", :id => "#{dom_id(taxon, :rem_spinner)}"
-        = link_to_remote icon('delete') + ' ' + t('remove'),                                                                                  |
-          {:url => remove_admin_product_taxon_url(@product, taxon),                                                                           |
-          :loading => "jQuery('##{dom_id(taxon, :rem_spinner)}').show()",                                                                     |
-          :update => 'selected-taxons',                                                                                                       |
-          :complete => "jQuery('##{dom_id(taxon, :sel)}').remove(); jQuery('##{dom_id(taxon, :rem_spinner)}').hide();"}, :class => 'iconlink' |
-    </haml:block>
+      %tr{:id => dom_id(taxon, :sel)}
+        %td= taxon.name
+        %td= taxon_path taxon
+        %td.actions
+          = image_tag "spinner.gif", :style => "display:none", :id => "#{dom_id(taxon, :rem_spinner)}"
+          - link_text = icon('delete') + ' ' + t('remove')
+          - link_url = remove_admin_product_taxon_url(@product, taxon)
+          - link_loading = "jQuery('##{dom_id(taxon, :rem_spinner)}').show();"
+          - link_complete = "jQuery('##{dom_id(taxon, :sel)}').remove(); jQuery('##{dom_id(taxon, :rem_spinner)}').hide();"
+          - link_opts = {:url => link_url, :loading => link_loading, :update => 'selected-taxons', :complete => link_complete}
+          = link_to_remote link_text, link_opts, :class => 'iconlink'
     - if taxons.empty?
-    %tr
-      %td{:colspan => "3"}
-        = t('none')
-        \.
-    </haml:block>
+      %tr
+        %td{:colspan => "3"} #{t('none')}.

app/views/admin/taxons/available.js.haml

@@ -13,20 +13,17 @@
       %th= t("action")
   %tbody
     - @available_taxons.each do |taxon|
-    %tr{:id => dom_id(taxon)}
-      %td= taxon.name
-      %td= taxon_path taxon
-      %td.actions
-        = image_tag "spinner.gif", :style => "display:none", :id => "#{dom_id(taxon, :spinner)}"
-        = link_to_remote icon('add') + ' ' + t('select'),                                                                           |
-          {:url => select_admin_product_taxon_path(@product, taxon),                                                                |
-          :loading => "jQuery('##{dom_id(taxon, :spinner)}').show()",                                                               |
-          :update => 'selected-taxons',                                                                                             |
-          :complete => "jQuery('##{dom_id(taxon)}').remove(); jQuery('##{dom_id(taxon, :spinner)}').hide();"}, :class => 'iconlink' |
-    </haml:block>
+      %tr{:id => dom_id(taxon)}
+        %td= taxon.name
+        %td= taxon_path taxon
+        %td.actions
+          = image_tag "spinner.gif", :style => "display:none", :id => "#{dom_id(taxon, :spinner)}"
+          - link_text = icon('add') + ' ' + t('select')
+          - link_url = select_admin_product_taxon_path(@product, taxon)
+          - link_loading = "jQuery('##{dom_id(taxon, :spinner)}').show();"
+          - link_complete = "jQuery('##{dom_id(taxon)}').remove(); jQuery('##{dom_id(taxon, :spinner)}').hide();"
+          - link_opts = {:url => link_url, :loading => link_loading, :update => 'selected-taxons', :complete => link_complete}
+          = link_to_remote link_text, link_opts, :class => 'iconlink'
     - if @available_taxons.empty?
-    %tr
-      %td{:colspan => "3"}
-        = t('no_match_found')
-        \.
-    </haml:block>
+      %tr
+        %td{:colspan => "3"} #{t('no_match_found')}.

app/views/admin/taxons/remove.html.haml

@@ -1 +1 @@
-= render :partial => "taxon_table", :locals => {:taxons => @taxons}
+= render :partial => "taxon_table", :locals => {:taxons => @taxons}

app/views/admin/taxons/select.html.haml

@@ -1 +1 @@
-= render :partial => "taxon_table", :locals => {:taxons => @taxons}
+= render :partial => "taxon_table", :locals => {:taxons => @taxons}

app/views/admin/taxons/selected.html.haml

@@ -1,36 +1,32 @@
 = render :partial => 'admin/shared/product_sub_menu'
 = render :partial => 'admin/shared/product_tabs', :locals => {:current => "Taxons"}
-#selected-taxons
-  = render :partial => "taxon_table", :locals => {:taxons => @taxons}
+#selected-taxons= render :partial => "taxon_table", :locals => {:taxons => @taxons}
 - form_tag('#') do
-  %label
-    = t('search')
-    \:
+  %label #{t('search')}:
   %input#searchtext{:size => "25"}/
-- javascript_tag do
+:javascript
   function search_for_taxons(){
-  jQuery.ajax({
-  data: {q: jQuery("#searchtext").val() },
-  success: function(request){
-  jQuery('#search_hits').html(request);
-  },
-  type: 'post',
-  url: '#{available_admin_product_taxons_url(@product)}'
-  });
+    jQuery.ajax({
+      data: {q: jQuery("#searchtext").val() },
+      success: function(request){
+        jQuery('#search_hits').html(request);
+      },
+      type: 'post',
+      url: '#{available_admin_product_taxons_url(@product)}'
+    });
   }
 
   jQuery("#searchtext").keypress(function (e) {
-  if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
-  search_for_taxons();
-
-  return false;
-  } else {
-  return true;
-  }
+    if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
+      search_for_taxons();
+      return false;
+    } else {
+      return true;
+    }
   });
 
   jQuery("#searchtext").delayedObserver(0.75, function(element, value) {
-  search_for_taxons();
-  })
+    search_for_taxons();
+  });
 %br/
-#search_hits
+#search_hits

app/views/admin/trackers/_form.html.haml

@@ -6,8 +6,7 @@
   %tr
     %td
       %label= t("environment")
-    %td
-      = collection_select(:tracker, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => "tracker-env"})
+    %td= collection_select(:tracker, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => "tracker-env"})
   %tr
     %td
       %label= t("active")
@@ -19,4 +18,4 @@
       %label.sub
         = radio_button(:tracker, :active, false )
         = t("no")
-  = hook :additional_tracker_fields
+  = hook :additional_tracker_fields

app/views/admin/trackers/edit.html.haml

@@ -1,7 +1,6 @@
 = render :partial => 'admin/shared/configuration_menu'
 %h1= t("editing_tracker")
 = error_messages_for :tracker
-- form_for(@tracker, :url => object_url, :html => { :method => :put }) do |f|
-  = render :partial => "form", :locals => { :f => f }
-  %p
-    = submit_tag t("update")
+- form_for(@tracker, :url => object_url, :html => {:method => :put}) do |f|
+  = render :partial => "form", :locals => {:f => f}
+  %p= submit_tag t("update")

app/views/admin/trackers/index.html.haml

@@ -1,8 +1,7 @@
 = render :partial => 'admin/shared/configuration_menu'
 .toolbar
   %ul.actions
-    %li
-      = button_link_to t("new_tracker"), new_object_url, :icon => 'add'
+    %li= button_link_to t("new_tracker"), new_object_url, :icon => 'add'
   %br.clear/
 %h1= t("analytics_trackers")
 %table.index
@@ -14,15 +13,13 @@
     %th= t("action")
   %tbody
     - @trackers.each do |tracker|
-    %tr{:id => dom_id tracker}
-      - locals = {:tracker => tracker}
-      - hook :admin_trackers_index_rows, locals do
-      %td= tracker.analytics_id
-      %td= tracker.environment.to_s.titleize
-      %td= tracker.active.to_s.titleize
-      </haml:block>
-      %td
-        = link_to_edit tracker
-        \&nbsp;
-        \#{link_to_delete tracker}
-    </haml:block>
+      %tr{:id => dom_id(tracker)}
+        - locals = {:tracker => tracker}
+        - hook :admin_trackers_index_rows, locals do
+          %td= tracker.analytics_id
+          %td= tracker.environment.to_s.titleize
+          %td= tracker.active.to_s.titleize
+        %td
+          = link_to_edit tracker
+          \&nbsp;
+          = link_to_delete tracker

app/views/admin/trackers/new.html.haml

@@ -2,6 +2,5 @@
 %h1= t("new_tracker")
 = error_messages_for :tracker
 - form_for(:tracker, :url => collection_url) do |f|
-  = render :partial => "form", :locals => { :f => f }
-  %p
-    = submit_tag t("create")
+  = render :partial => "form", :locals => {:f => f}
+  %p= submit_tag t("create")

app/views/admin/users/_form.html.haml

@@ -16,9 +16,8 @@
 %p
   %label= t("roles")
   %br/
-  - for role in @roles
-  %label.sub
-    = check_box_tag "user[role][#{role.name}]", 1, @user.has_role?(role.name)
-    = role.name
-  \ 
-  </haml:block>
+  - @roles.each do |role|
+    %label.sub
+      = check_box_tag "user[role][#{role.name}]", 1, @user.has_role?(role.name)
+      = role.name
+    \&nbsp;

app/views/admin/users/edit.html.haml

@@ -1,7 +1,7 @@
 = error_messages_for :user
 %h1= t("editing_user")
-- form_for(:user, :url => object_url, :html => { :method => :put }) do |f|
-  = render :partial => "form", :locals => { :f => f }
+- form_for(:user, :url => object_url, :html => {:method => :put}) do |f|
+  = render :partial => "form", :locals => {:f => f}
   %p.form-buttons
     = button t("update")
-    = link_to t('cancel'), collection_url
+    = link_to t('cancel'), collection_url

app/views/admin/users/index.html.haml

@@ -11,13 +11,12 @@
       %th= t("action")
   %tbody
     - @collection.each do |user|
-    %tr{:id => dom_id user}
-      %td{:width => "350px"}= link_to user.email, object_url(user)
-      %td
-        = link_to_edit user
-        \ 
-        \#{link_to_delete user}
-    </haml:block>
+      %tr{:id => dom_id(user)}
+        %td{:width => "350px"}= link_to user.email, object_url(user)
+        %td
+          = link_to_edit user
+          \&nbsp;
+          = link_to_delete user
 = will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;")
 - content_for :sidebar do
   - form_for @search do |f|
@@ -26,5 +25,5 @@
       %p
         = t("email")
         %br/
-        = f.text_field :email_contains, :size=>18
-      %p= button t("search")
+        = f.text_field :email_contains, :size => 18
+      %p= button t("search")

app/views/admin/users/new.html.haml

@@ -1,7 +1,7 @@
 = error_messages_for :user
 %h1= t("new_user")
 - form_for(:user, :url => collection_url) do |f|
-  = render :partial => "form", :locals => { :f => f }
+  = render :partial => "form", :locals => {:f => f}
   %p.form-buttons
     = button t("create")
-    = link_to t('cancel'), collection_url
+    = link_to t('cancel'), collection_url

app/views/admin/users/show.html.haml

@@ -2,13 +2,11 @@
 %table
   %tr
     %th= t("email")
-    %td
-      = @user.email
+    %td= @user.email
   %tr
     %th= t("roles")
-    %td
-      = list_roles(@user)
+    %td= list_roles(@user)
 %p
   = link_to_edit @user
   \ 
-  \#{link_to t('back'), collection_url}
+  = link_to t('back'), collection_url

app/views/admin/variants/_form.html.haml

@@ -1,17 +1,15 @@
 .yui-gb
   .yui-u.first
     - @product.options.each do |option|
-    %p
-      = label :new_variant, option.option_type.presentation
-      %br/
-      - if @variant.new_record?
-        = select(:new_variant, option.option_type.presentation,                        |
-          option.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] }, |
-          {})                                                                          |
-      - else
-        - opt = @variant.option_values.detect {|o| o.option_type == option.option_type }.presentation
-        = text_field(:new_variant,  option.option_type.presentation, :value => opt, :disabled => 'disabled')
-    </haml:block>
+      %p
+        = label :new_variant, option.option_type.presentation
+        %br/
+        - if @variant.new_record?
+          - opt_values = option.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] }
+          = select(:new_variant, option.option_type.presentation, opt_values, {})
+        - else
+          - opt = @variant.option_values.detect {|o| o.option_type == option.option_type }.presentation
+          = text_field(:new_variant,  option.option_type.presentation, :value => opt, :disabled => 'disabled')
     %p
       = f.label :sku, t("sku")
       %br/
@@ -33,4 +31,4 @@
       = f.text_field :on_hand
   .yui-u
     - Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field|
-      = render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f}
+      = render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f}

app/views/admin/variants/edit.html.haml

@@ -1,7 +1,7 @@
 = render :partial => 'admin/shared/product_sub_menu'
 = render :partial => 'admin/shared/product_tabs', :locals => {:current => "Variants"}
 = error_messages_for :variant
-- form_for(@variant, :url => object_url, :html => { :method => :put }) do |f|
+- form_for(@variant, :url => object_url, :html => {:method => :put}) do |f|
   - hook :admin_variant_edit_form, {:f => f} do
-    = render :partial => "form", :locals => { :f => f }
-  = render :partial => 'admin/shared/edit_resource_links'
+    = render :partial => "form", :locals => {:f => f}
+  = render :partial => 'admin/shared/edit_resource_links'