summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:04:03 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:04:03 +0100
commitab63774d954fe1f967a97ffe5a0a66016eca2257 (patch)
treeb3974a58deabe6a989ad7352f10e75d7495cb0c5 /app/views/shared
parent495bbfdf78206c8adaec057e83900dda6754092c (diff)
parentf8bc860750f06ab95f9ced8e919e846d3e589819 (diff)
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/_create_link.html.haml14
-rw-r--r--app/views/shared/_flash.html.haml19
-rw-r--r--app/views/shared/_index_view_edit_destroy_part.html.haml63
-rw-r--r--app/views/shared/_show_edit_destroy_part.html.haml20
-rw-r--r--app/views/shared/_system_message.html.haml10
5 files changed, 57 insertions, 69 deletions
diff --git a/app/views/shared/_create_link.html.haml b/app/views/shared/_create_link.html.haml
index 103c82b..0711ddf 100644
--- a/app/views/shared/_create_link.html.haml
+++ b/app/views/shared/_create_link.html.haml
@@ -2,10 +2,18 @@
- if can? :create, parent.send(child_class.name.underscore.pluralize).build
%p
- if t("#{child_class.name.underscore.pluralize}.index.actions.create_for").include?('translation missing') || (!(defined? short_link).nil? && short_link == true)
- = link_to t("#{child_class.name.underscore.pluralize}.index.actions.create"), method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent)
+ %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
+ %i.icon-plus.icon-white
+ =t("#{child_class.name.underscore.pluralize}.index.actions.create")
- else
- = link_to t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s), method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent)
+ %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
+ %i.icon-plus.icon-white
+ / =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s)
+ =t("#{child_class.name.underscore.pluralize}.index.actions.create")
+
- elsif !(defined? child_class).nil?
- if can? :create, child_class
%p
- = link_to t("#{child_class.name.underscore.pluralize}.index.actions.create"), method( :"new_#{child_class.name.underscore}_path" ).() \ No newline at end of file
+ %a.btn.btn-mini.btn-primary{:href => method( :"new_#{child_class.name.underscore}_path" ).() }
+ %i.icon-plus.icon-white
+ =t("#{child_class.name.underscore.pluralize}.index.actions.create") \ No newline at end of file
diff --git a/app/views/shared/_flash.html.haml b/app/views/shared/_flash.html.haml
deleted file mode 100644
index 320fd15..0000000
--- a/app/views/shared/_flash.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-- flash.each do |type, msg|
- .flash{:class => type}
- .light
- .sign= resolve_flash_sign(type)
- .message= msg
-
-
--# These are the available types:
--#
--# .flash.notice
--# .light
--# .sign i
--# .message Lorem ipsum dolor sit amet, consectetur adipisicing eli.w
--#
--# .flash.warning
--# .light
--# .sign !
--# .message Lorem ipsum dolor sit amet, consectetur adipisicing eli.w
-
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 ff5a988..00b9e8a 100644
--- a/app/views/shared/_index_view_edit_destroy_part.html.haml
+++ b/app/views/shared/_index_view_edit_destroy_part.html.haml
@@ -1,35 +1,40 @@
-- style = 'width:35px'
+- style = 'width:90px'
+- style = ''
- if !(defined? parent).nil? && !(defined? child).nil?
- %td{ :style => style }
- - if can? :show, child
- = link_to t("#{child.class.name.underscore.pluralize}.index.actions.show"), method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child)
- %td{ :style => style }
- - if can? :edit, child
- = link_to t("#{child.class.name.underscore.pluralize}.index.actions.edit"), method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child)
- %td{ :style => style }
- - if can? :destroy, child
- = link_to t("#{child.class.name.underscore.pluralize}.index.actions.destroy"), method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :delete
- - if child.respond_to?(:move_up?) or child and child.respond_to?(:move_down?)
+ - if can? :show, child
%td{ :style => style }
- - if can? :move_down, child and child.respond_to?(:move_down?) and child.move_down?
- = link_to '&#8681;'.html_safe, method( :"move_lower_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :put
- - if can? :move_up, child and child.respond_to?(:move_up?) and child.move_up?
- = link_to '&#8679;'.html_safe, method( :"move_higher_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :put
+ %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")
+
+ - 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? :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")
- elsif !(defined? child).nil?
- %td{ :style => style }
- - if can? :show, child
- = link_to t("#{child.class.name.underscore.pluralize}.index.actions.show"), method( :"#{child.class.name.underscore}_path" ).(child)
- %td{ :style => style }
- - if can? :edit, child
- = link_to t("#{child.class.name.underscore.pluralize}.index.actions.edit"), method( :"edit_#{child.class.name.underscore}_path" ).(child)
- %td{ :style => style }
- - if can? :destroy, child
- = link_to t("#{child.class.name.underscore.pluralize}.index.actions.destroy"), method( :"#{child.class.name.underscore}_path" ).(child), :method => :delete
- - if child.respond_to?(:move_up?) or child and child.respond_to?(:move_down?)
+ - 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")
+
+ - 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 }
- - if can? :move_down, child and child.respond_to?(:move_down?) and child.move_down?
- = link_to '&#8681;'.html_safe, method( :"move_lower_#{child.class.name.underscore}_path" ).(child), :method => :put
- - if can? :move_up, child and child.respond_to?(:move_up?) and child.move_up?
- = link_to '&#8679;'.html_safe, method( :"move_higher_#{child.class.name.underscore}_path" ).(child), :method => :put
+ %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
diff --git a/app/views/shared/_show_edit_destroy_part.html.haml b/app/views/shared/_show_edit_destroy_part.html.haml
index aff18d1..e82c667 100644
--- a/app/views/shared/_show_edit_destroy_part.html.haml
+++ b/app/views/shared/_show_edit_destroy_part.html.haml
@@ -1,16 +1,20 @@
%p
- if !(defined? parent).nil? && !(defined? child).nil?
- if can? :edit, child
- = link_to t("#{child.class.name.underscore.pluralize}.show.actions.edit"), method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child)
+ %a.btn.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}.actions.edit")
- if can? :destroy, child
- - if can? :edit, child
- |
- = link_to t("#{child.class.name.underscore.pluralize}.show.actions.destroy"), method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :method => :delete
+ %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
+ %i.icon-trash.icon-white
+ =t("#{child.class.name.underscore.pluralize}.actions.destroy")
- elsif !(defined? child).nil?
- if can? :edit, child
- = link_to t("#{child.class.name.underscore.pluralize}.show.actions.edit"), method( :"edit_#{child.class.name.underscore}_path" ).(child)
+ %a.btn.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
+ %i.icon-edit.icon-white
+ =t("#{child.class.name.underscore.pluralize}.actions.edit")
- if can? :destroy, child
- - if can? :edit, child
- |
- = link_to t("#{child.class.name.underscore.pluralize}.show.actions.destroy"), method( :"#{child.class.name.underscore}_path" ).(child), :method => :delete \ No newline at end of file
+ %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.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}.actions.destroy") \ No newline at end of file
diff --git a/app/views/shared/_system_message.html.haml b/app/views/shared/_system_message.html.haml
deleted file mode 100644
index 4aabb9c..0000000
--- a/app/views/shared/_system_message.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-- if current_user
- .flash.notice#system_message_display
- .light
- .sign i
- .message#system_message This is the place to display incoming calls and other stuff.
-
- = subscribe_to "/users/#{current_user.id}/system_messages"
-
- :javascript
- $('#system_message_display').hide() \ No newline at end of file