Merge branch 'develop'5.1-beta5

3 files changed, 99 insertions, 47 deletions

diff --git a/app/views/fax_documents/_form.html.haml b/app/views/fax_documents/_form.html.haml
index e240371..1b1c3be 100644
--- a/app/views/fax_documents/_form.html.haml
+++ b/app/views/fax_documents/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('fax_documents.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('fax_documents.form.submit')
diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml
index 8559f1c..5355521 100644
--- a/app/views/fax_documents/_index_core.html.haml
+++ b/app/views/fax_documents/_index_core.html.haml
@@ -2,25 +2,34 @@
   %thead
     %tr
       %th= t('fax_documents.index.sent_at')
-      %th= t('fax_documents.index.state')
-      %th= t('fax_documents.index.result')
       %th
         = t('fax_documents.index.phone_number')
         %br
         = t('fax_documents.index.remote_station_id')
       %th= t('fax_documents.index.thumbnails')
+      %th
+      %th
 
   %tbody
     - for fax_document in fax_documents
-      %tr{:id => "fax_document_#{fax_document.id}"}
-        - if fax_document.sent_at
-          %td
-            = "#{fax_document.inbound ? '⇨' : '⇦'}".html_safe
-            = l fax_document.sent_at, :format => :short
-          %td= t("fax_documents.states.#{fax_document.state}")
-          %td= t("fax_documents.result_codes.code_#{fax_document.result_code}") + " (#{fax_document.result_code})"
+      - case fax_document.state
+        - when 'unsuccessful'
+          - current_status = 'error'
+        - when 'sending'
+          - current_status = 'success'
+        - when 'queued_for_sending'
+          - current_status = 'warning'
         - else
-          %td{ :colspan => 3 }= t("fax_documents.states.#{fax_document.state}")
+          - current_status = ''
+
+      %tr{:class => current_status}
+        %td
+          - case fax_document.state
+            - when 'successful'
+              = "#{fax_document.inbound ? '⇨' : '⇦'}".html_safe
+              = l fax_document.sent_at, :format => :short
+            - else
+              = t("fax_documents.states.#{fax_document.state}")
         %td
           - if fax_document.inbound
             = "#{fax_document.caller_id_number} #{fax_document.caller_id_name}"
@@ -28,9 +37,21 @@
             = fax_document.destination_phone_number
           %br
           = fax_document.remote_station_id
-        %td 
-          - fax_document.fax_thumbnails.limit(5).each do |fax_thumbnail|
-            =image_tag fax_thumbnail.thumbnail_url(:mini), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}"
-          - if can?(:show, fax_document) && !fax_document.document.blank? && File.readable?(fax_document.document.path)
-            = link_to t('fax_documents.index.actions.download'), fax_account_fax_document_path(@fax_account, fax_document, :format => :pdf), :method => :get
+        %td
+          %ul.thumbnails
+            - fax_document.fax_thumbnails.limit(3).each do |fax_thumbnail|
+              %li.span1
+                %div.thumbnail
+                  %a.thumbnail{:href => fax_thumbnail.thumbnail.url}
+                    =image_tag(fax_thumbnail.thumbnail.url, :alt => "Page #{fax_thumbnail.position}")
+                  %p
+                    %small
+                      = "#{fax_thumbnail.position}/#{fax_document.fax_thumbnails.count}"
+
+          - if fax_document.document?
+            %p
+              %a{:href => fax_document.document.url}
+                %i{:class => 'icon-download'}
+                = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(fax_document.document.size, :precision => 2)})"
+
         =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => fax_document.fax_account, :child => fax_document}
diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index 41d3bff..9925c2f 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -1,36 +1,67 @@
 - content_for :title, t("fax_documents.show.page_title")
-- child = @fax_document
-- parent = @fax_document.fax_account
 
-%p
-  %strong= t('fax_documents.index.state') + ":"
-  = t("fax_documents.states.#{@fax_document.state}")
+.row
+  .span12
+    %table.table.table-striped
+      - case @fax_document.state
+        - when 'unsuccessful'
+          - current_status = 'error'
+        - when 'sending'
+          - current_status = 'success'
+        - when 'queued_for_sending'
+          - current_status = 'warning'
+        - else
+          - current_status = ''
 
-%p
-  %strong= t('fax_documents.index.result_code') + ":"
-  = @fax_document.result_code
+      %tr{:class => current_status}
+        %td
+          %strong= t('fax_documents.index.state') + ":"
+        %td
+          = t("fax_documents.states.#{@fax_document.state}")
+      %tr
+        %td
+          %strong= t('fax_documents.index.result_code') + ":"
+        %td
+          = @fax_document.result_code
+      %tr
+        %td
+          %strong= t('fax_documents.index.result_text') + ":"
+        %td
+          = t("fax_documents.result_codes.code_#{@fax_document.result_code}")
+      %tr
+        %td
+          %strong= t('fax_documents.show.document_transferred_pages') + ":"
+        %td
+          = @fax_document.document_transferred_pages
+      %tr
+        %td
+          %strong= t('fax_documents.show.remote_station_id') + ":"
+        %td
+          = @fax_document.remote_station_id
+      %tr
+        %td
+          %strong= t('fax_documents.show.fax_resolution') + ":"
+        %td
+          = @fax_document.fax_resolution
 
-%p
-  %strong= t('fax_documents.index.result_text') + ":"
-  = t("fax_documents.result_codes.code_#{@fax_document.result_code}")
+    - if @fax_document.document?
+      %p
+        %a{:href => @fax_document.document.url}
+          %i{:class => 'icon-download'}
+          = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(@fax_document.document.size, :precision => 2)})"
 
-%p
-  %strong= t('fax_documents.show.document_transferred_pages') + ":"
-  = @fax_document.document_transferred_pages
-%p
-  %strong= t('fax_documents.show.remote_station_id') + ":"
-  = @fax_document.remote_station_id
-%p
-  %strong= t('fax_documents.show.fax_resolution') + ":"
-  = @fax_document.fax_resolution
+.row
+  .span12
+    - if @fax_document.fax_thumbnails.any?
+      %ul.thumbnails
+        - @fax_document.fax_thumbnails.limit(50).each do |fax_thumbnail|
+          %li.span4
+            %div.thumbnail
+              %a.thumbnail{:href => fax_thumbnail.thumbnail.url}
+                =image_tag(fax_thumbnail.thumbnail.url, :alt => "Page #{fax_thumbnail.position}")
+              %p
+                = "#{fax_thumbnail.position}/#{@fax_document.fax_thumbnails.count}"
 
-- if @fax_document.fax_thumbnails.count > 0
-  - i = @fax_document.fax_thumbnails.count
-  - i = 10 if i > 10
-  - @fax_document.fax_thumbnails.limit(i).each do |fax_thumbnail|
-    =image_tag fax_thumbnail.thumbnail_url(:medium), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}"
-
-- if @fax_document.document.path
-  = link_to t("fax_documents.index.actions.download_pdf"), "#{request.protocol}#{request.host_with_port}#{request.fullpath.split("?")[0]}.pdf"
-  
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
+.row
+  .span12
+    = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }