Merge branch 'develop'5.1-beta2

1 files changed, 30 insertions, 34 deletions

diff --git a/app/views/shared/_index_view_edit_destroy_part.html.haml b/app/views/shared/_index_view_edit_destroy_part.html.haml
index 00b9e8a..6bb1e7b 100644
--- a/app/views/shared/_index_view_edit_destroy_part.html.haml
+++ b/app/views/shared/_index_view_edit_destroy_part.html.haml
@@ -1,40 +1,36 @@
-- style = 'width:90px'
-- style = ''
-
 - if !(defined? parent).nil? && !(defined? child).nil?
-  - if can? :show, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
-        %i.icon-info-sign.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+  %td
+    %span{:style => 'white-space: nowrap'}
+      - if can? :show, child
+        %a.btn.btn-small.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
+          %i.icon-info-sign.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
-  - if can? :edit, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
-        %i.icon-edit.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+      - if can? :edit, child
+        %a.btn.btn-small.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
+          %i.icon-edit.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
 
-  - if can? :destroy, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
-        %i.icon-remove.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+      - if can? :destroy, child
+        %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
+          %i.icon-remove.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
 
 - elsif !(defined? child).nil?
-  - if can? :show, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
-        %i.icon-info-sign.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+  %td
+    %span{:style => 'white-space: nowrap'}
+      - if can? :show, child
+        %a.btn.btn-small.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
+          %i.icon-info-sign.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
-  - if can? :edit, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
-        %i.icon-edit.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
-        
-  - if can? :destroy, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
-        %i.icon-trash.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
\ No newline at end of file
+      - if can? :edit, child
+        %a.btn.btn-small.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
+          %i.icon-edit.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+          
+      - if can? :destroy, child
+        %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
+          %i.icon-trash.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+            
\ No newline at end of file