summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-28 11:58:06 +0100
committerspag <spag@golwen.net>2013-01-28 11:58:06 +0100
commit7153a04a09db1b163ecf51c00f7471552f94722c (patch)
tree2a2c3ed7333faacbda4aea7b74694858aaef9912 /app
parent5d17b4b7e41a62d2c7f1dabae8ad7376211e921a (diff)
parentbcdd0a3584f23438257619ee4081949c1e653c91 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app')
-rw-r--r--app/views/shared/_create_link.html.haml3
-rw-r--r--app/views/shared/_index_view_edit_destroy_part.html.haml19
2 files changed, 8 insertions, 14 deletions
diff --git a/app/views/shared/_create_link.html.haml b/app/views/shared/_create_link.html.haml
index b1eef1f..53e9dbc 100644
--- a/app/views/shared/_create_link.html.haml
+++ b/app/views/shared/_create_link.html.haml
@@ -8,8 +8,7 @@
- else
%a.btn.btn-small.btn-default{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
%i.icon-plus
- / =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s)
- =t("#{child_class.name.underscore.pluralize}.index.actions.create")
+ =t("#{child_class.name.underscore.pluralize}.index.actions.create")
- elsif !(defined? child_class).nil?
- if can? :create, child_class
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 8e119fe..6bb1e7b 100644
--- a/app/views/shared/_index_view_edit_destroy_part.html.haml
+++ b/app/views/shared/_index_view_edit_destroy_part.html.haml
@@ -4,20 +4,17 @@
- 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
- %span.hidden-phone
- =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+ =t("#{child.class.name.underscore.pluralize}.index.actions.show")
- 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
- %span.hidden-phone
- =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+ =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( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
%i.icon-remove.icon-white
- %span.hidden-phone
- =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+ =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
- elsif !(defined? child).nil?
%td
@@ -25,17 +22,15 @@
- if can? :show, child
%a.btn.btn-small.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
%i.icon-info-sign.icon-white
- %span.hidden-phone
- =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+ =t("#{child.class.name.underscore.pluralize}.index.actions.show")
- if can? :edit, child
%a.btn.btn-small.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
%i.icon-edit.icon-white
- %span.hidden-phone
- =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+ =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
- %span.hidden-phone
- =t("#{child.class.name.underscore.pluralize}.index.actions.destroy") \ No newline at end of file
+ =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+ \ No newline at end of file