From: Michal Fojtik <[email protected]> * Removed all HAML views for handling errors * Added one HAML view to handle them all
Signed-off-by: Michal fojtik <[email protected]> --- server/views/errors/400.html.haml | 41 ------------------------------- server/views/errors/400.xml.haml | 3 --- server/views/errors/401.html.haml | 26 -------------------- server/views/errors/401.xml.haml | 3 --- server/views/errors/403.html.haml | 42 -------------------------------- server/views/errors/403.xml.haml | 8 ------ server/views/errors/404.html.haml | 28 --------------------- server/views/errors/404.xml.haml | 3 --- server/views/errors/405.html.haml | 29 ---------------------- server/views/errors/405.xml.haml | 5 ---- server/views/errors/409.html.haml | 47 ------------------------------------ server/views/errors/409.xml.haml | 11 --------- server/views/errors/500.html.haml | 47 ------------------------------------ server/views/errors/500.xml.haml | 13 ---------- server/views/errors/501.html.haml | 44 --------------------------------- server/views/errors/501.xml.haml | 1 - server/views/errors/502.html.haml | 44 --------------------------------- server/views/errors/502.xml.haml | 1 - server/views/errors/504.html.haml | 43 --------------------------------- server/views/errors/504.xml.haml | 1 - server/views/errors/common.html.haml | 47 ++++++++++++++++++++++++++++++++++++ server/views/errors/common.xml.haml | 16 ++++++++++++ 22 files changed, 63 insertions(+), 440 deletions(-) delete mode 100644 server/views/errors/400.html.haml delete mode 100644 server/views/errors/400.xml.haml delete mode 100644 server/views/errors/401.html.haml delete mode 100644 server/views/errors/401.xml.haml delete mode 100644 server/views/errors/403.html.haml delete mode 100644 server/views/errors/403.xml.haml delete mode 100644 server/views/errors/404.html.haml delete mode 100644 server/views/errors/404.xml.haml delete mode 100644 server/views/errors/405.html.haml delete mode 100644 server/views/errors/405.xml.haml delete mode 100644 server/views/errors/409.html.haml delete mode 100644 server/views/errors/409.xml.haml delete mode 100644 server/views/errors/500.html.haml delete mode 100644 server/views/errors/500.xml.haml delete mode 100644 server/views/errors/501.html.haml delete mode 100644 server/views/errors/501.xml.haml delete mode 100644 server/views/errors/502.html.haml delete mode 100644 server/views/errors/502.xml.haml delete mode 100644 server/views/errors/504.html.haml delete mode 100644 server/views/errors/504.xml.haml create mode 100644 server/views/errors/common.html.haml create mode 100644 server/views/errors/common.xml.haml diff --git a/server/views/errors/400.html.haml b/server/views/errors/400.html.haml deleted file mode 100644 index aeae736..0000000 --- a/server/views/errors/400.html.haml +++ /dev/null @@ -1,41 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3=[@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= @error.details - - else - %em No details - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %pre=(@error.backtrace.nil?) ? "n/a" : @error.backtrace.join("\n") - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/400.xml.haml b/server/views/errors/400.xml.haml deleted file mode 100644 index dd512a2..0000000 --- a/server/views/errors/400.xml.haml +++ /dev/null @@ -1,3 +0,0 @@ -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %message< #{cdata @error.message} - %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" } diff --git a/server/views/errors/401.html.haml b/server/views/errors/401.html.haml deleted file mode 100644 index cbdff37..0000000 --- a/server/views/errors/401.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3 Authentication Failure - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= @error.details - - else - %em No details - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/401.xml.haml b/server/views/errors/401.xml.haml deleted file mode 100644 index dd8894a..0000000 --- a/server/views/errors/401.xml.haml +++ /dev/null @@ -1,3 +0,0 @@ -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %message Authentication required - diff --git a/server/views/errors/403.html.haml b/server/views/errors/403.html.haml deleted file mode 100644 index 781b6ae..0000000 --- a/server/views/errors/403.html.haml +++ /dev/null @@ -1,42 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3=[@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= @error.details - - else - %em No details - - - if @error.backtrace - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %[email protected]("\n") - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/403.xml.haml b/server/views/errors/403.xml.haml deleted file mode 100644 index 4b4cf23..0000000 --- a/server/views/errors/403.xml.haml +++ /dev/null @@ -1,8 +0,0 @@ -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" } - %backtrace=cdata(@error.backtrace.join("\n")) - - if params - %request - - params.each do |k, v| - %param{ :name => k}=v - %message Method not allowed for this resource diff --git a/server/views/errors/404.html.haml b/server/views/errors/404.html.haml deleted file mode 100644 index a05c1eb..0000000 --- a/server/views/errors/404.html.haml +++ /dev/null @@ -1,28 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3 Not Found - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request Headers - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request_headers.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/404.xml.haml b/server/views/errors/404.xml.haml deleted file mode 100644 index 5de624c..0000000 --- a/server/views/errors/404.xml.haml +++ /dev/null @@ -1,3 +0,0 @@ -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" } - %message Resource not found diff --git a/server/views/errors/405.html.haml b/server/views/errors/405.html.haml deleted file mode 100644 index 12e51b0..0000000 --- a/server/views/errors/405.html.haml +++ /dev/null @@ -1,29 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3 Method not allowed on given resource - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/405.xml.haml b/server/views/errors/405.xml.haml deleted file mode 100644 index e0198f5..0000000 --- a/server/views/errors/405.xml.haml +++ /dev/null @@ -1,5 +0,0 @@ -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %message - Requested method not allowed - %method - =request.env['REQUEST_METHOD'] diff --git a/server/views/errors/409.html.haml b/server/views/errors/409.html.haml deleted file mode 100644 index fb9daca..0000000 --- a/server/views/errors/409.html.haml +++ /dev/null @@ -1,47 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3= h [@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= h @error.details - - else - %em No details - %li{ :'data-role' => 'list-divider'} Backtrace - %li - %em No details - - - if @error.backtrace - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %pre= h @error.backtrace.join("\n") - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}= h value.inspect diff --git a/server/views/errors/409.xml.haml b/server/views/errors/409.xml.haml deleted file mode 100644 index de05bf8..0000000 --- a/server/views/errors/409.xml.haml +++ /dev/null @@ -1,11 +0,0 @@ -- unless defined?(partial) - !!! XML -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %kind backend_error - %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" } - %code=response.status - %message< #{cdata @error.message} - - if params - %request - - params.each do |k, v| - %param{ :name => k}=v diff --git a/server/views/errors/500.html.haml b/server/views/errors/500.html.haml deleted file mode 100644 index 8cd3c74..0000000 --- a/server/views/errors/500.html.haml +++ /dev/null @@ -1,47 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3= h [@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= h @error.details - - else - %em No details - %li{ :'data-role' => 'list-divider'} Backtrace - %li - %pre= bt @error.backtrace - - - if @error.backtrace - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %pre= h @error.backtrace.join("\n") - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}= h value.inspect diff --git a/server/views/errors/500.xml.haml b/server/views/errors/500.xml.haml deleted file mode 100644 index b3e71e2..0000000 --- a/server/views/errors/500.xml.haml +++ /dev/null @@ -1,13 +0,0 @@ -- unless defined?(partial) - !!! XML -%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"} - %kind backend_error - %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" } - %code=response.status - %message< #{cdata @error.message} - - if @error.respond_to?(:backtrace) and [email protected]? - %backtrace=cdata(@error.backtrace.join("\n")) - - if params - %request - - params.each do |k, v| - %param{ :name => k}=v diff --git a/server/views/errors/501.html.haml b/server/views/errors/501.html.haml deleted file mode 100644 index 428e452..0000000 --- a/server/views/errors/501.html.haml +++ /dev/null @@ -1,44 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3=[@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= @error.details - - else - %em No details - - - if @error.class.method_defined? :backtrace - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %[email protected]("\n") unless @error.backtrace.nil? - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/501.xml.haml b/server/views/errors/501.xml.haml deleted file mode 100644 index a4015a4..0000000 --- a/server/views/errors/501.xml.haml +++ /dev/null @@ -1 +0,0 @@ -= haml :'errors/500', :locals => { :@error => @error, :partial => true } diff --git a/server/views/errors/502.html.haml b/server/views/errors/502.html.haml deleted file mode 100644 index a41402b..0000000 --- a/server/views/errors/502.html.haml +++ /dev/null @@ -1,44 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3=[@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= @error.details - - else - %em No details - - - if @error.backtrace - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %[email protected]("\n") - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/502.xml.haml b/server/views/errors/502.xml.haml deleted file mode 100644 index a4015a4..0000000 --- a/server/views/errors/502.xml.haml +++ /dev/null @@ -1 +0,0 @@ -= haml :'errors/500', :locals => { :@error => @error, :partial => true } diff --git a/server/views/errors/504.html.haml b/server/views/errors/504.html.haml deleted file mode 100644 index 19cf090..0000000 --- a/server/views/errors/504.html.haml +++ /dev/null @@ -1,43 +0,0 @@ -%div{ :'data-role' => :content, :'data-theme' => 'b'} - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li{ :'data-role' => 'list-divider'} Server message - %li - %h3=[@error.class.name, @error.message].join(' - ') - %li{ :'data-role' => 'list-divider'} Original request URI - %li - %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} - %span=request.env['REQUEST_URI'] - %span{ :class => 'ui-li-count'} Retry - %li{ :'data-role' => 'list-divider'} Error details - %li - - if @error.class.method_defined? :details - %p= @error.details - - else - %em No details - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Backtrace - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - %li - %[email protected]("\n") - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Parameters - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - if params.keys.empty? - %li{ :'data-role' => 'list-divider'} No parameters - - params.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect - - - %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} - %h3 Request details - %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} - - request.env.each do |key, value| - - next if value.inspect.to_s == '#' - %li{ :'data-role' => 'list-divider'}=key - %li - %span{:style => 'font-weight:normal;'}=value.inspect diff --git a/server/views/errors/504.xml.haml b/server/views/errors/504.xml.haml deleted file mode 100644 index a4015a4..0000000 --- a/server/views/errors/504.xml.haml +++ /dev/null @@ -1 +0,0 @@ -= haml :'errors/500', :locals => { :@error => @error, :partial => true } diff --git a/server/views/errors/common.html.haml b/server/views/errors/common.html.haml new file mode 100644 index 0000000..8cd3c74 --- /dev/null +++ b/server/views/errors/common.html.haml @@ -0,0 +1,47 @@ +%div{ :'data-role' => :content, :'data-theme' => 'b'} + %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} + %li{ :'data-role' => 'list-divider'} Server message + %li + %h3= h [@error.class.name, @error.message].join(' - ') + %li{ :'data-role' => 'list-divider'} Original request URI + %li + %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'} + %span=request.env['REQUEST_URI'] + %span{ :class => 'ui-li-count'} Retry + %li{ :'data-role' => 'list-divider'} Error details + %li + - if @error.class.method_defined? :details + %p= h @error.details + - else + %em No details + %li{ :'data-role' => 'list-divider'} Backtrace + %li + %pre= bt @error.backtrace + + - if @error.backtrace + %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} + %h3 Backtrace + %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} + %li + %pre= h @error.backtrace.join("\n") + + %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} + %h3 Parameters + %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} + - if params.keys.empty? + %li{ :'data-role' => 'list-divider'} No parameters + - params.each do |key, value| + - next if value.inspect.to_s == '#' + %li{ :'data-role' => 'list-divider'}=key + %li + %span{:style => 'font-weight:normal;'}=value.inspect + + + %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"} + %h3 Request details + %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'} + - request.env.each do |key, value| + - next if value.inspect.to_s == '#' + %li{ :'data-role' => 'list-divider'}=key + %li + %span{:style => 'font-weight:normal;'}= h value.inspect diff --git a/server/views/errors/common.xml.haml b/server/views/errors/common.xml.haml new file mode 100644 index 0000000..5509a87 --- /dev/null +++ b/server/views/errors/common.xml.haml @@ -0,0 +1,16 @@ +- unless defined?(partial) + !!! XML +%error{ :url => request.env['REQUEST_URI'], :status => response.status } + %backend{ :driver => driver_symbol, :provider => current_provider } + %code=response.status + %message< + - if @error.respond_to? :message + =cdata @error.message + - else + =translate_error_code(response.status) + - if @error.respond_to? :backtrace + %[email protected]? ? '' : @error.backtrace.join("\n") + %request + - if params + -params.each do |name, value| + %param{ :name => name }=cdata value.inspect -- 1.8.0.2
