diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 8b79e2b..f35d236 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -257,4 +257,10 @@ div.toolbar-inline > div.dropdown } div.btn-toolbar > div.dropdown > ul.dropdown-menu { font-size: small; +} +div.toolbar-inline > .ficon.fa-stack { +height:1em; +line-height:1em; +width:1em; +height:1em; } \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f2ded81..5d0cf3c 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -53,6 +53,10 @@ m.save content_tag("i","", class: "ficon "+name ) end + def fa_stack(icon1, icon2) + content_tag("i", content_tag("i","", class: "ficon "+" fa-"+icon1+" fa fa-stack-1x" ) + content_tag("i","", class: "ficon "+" fa-"+icon2+" fa fa-stack-1x" ),class: "fa-stack") + + end def ffi1_list y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml") y["ffi1"] diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 16dfd58..7b7373c 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -13,9 +13,9 @@ module AttachmentsHelper render(partial:"attachments/attachment_list", object: p.attachments, locals: {editor: (can?(:edit, p)), parent: p} ) end - def render_new_attachments_for(p, text, options={}) + def render_new_attachments_for(p, text="", options={}) a= Attachment.new a.parent=p - ((can?(:edit, p))? (render partial:"attachments/form_bulk2", object: a ): "")+ link_to(text, new_calentry_path(),options) + ((can?(:edit, p))? (render partial:"attachments/form_bulk2", object: a ): "") end end diff --git a/app/views/attachments/_form_bulk2.html.erb b/app/views/attachments/_form_bulk2.html.erb index 16958a1..db3e35e 100644 --- a/app/views/attachments/_form_bulk2.html.erb +++ b/app/views/attachments/_form_bulk2.html.erb @@ -4,7 +4,7 @@
-
+
@@ -28,6 +28,9 @@
+
+
+
diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index b0a4366..e78c65b 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -21,10 +21,11 @@ <%= link_to "+" , new_survey_choice_path(params:{question_id: question.id}), remote: true if can? :edit, question %> <% end %> -
- <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 unless question.flag_delete %>
+ <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 unless question.flag_delete %> +
+ <% end %> diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb index 222eb9f..ad6e9dd 100644 --- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb @@ -3,6 +3,9 @@ <%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open", title: "Attachments" if can? :edit, @neuigkeit %> <%= link_to fa_icon("calendar-o"), new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true, class: :btn if can? :edit, @neuigkeit %> + + <%= link_to fa_stack("calendar-o","ban"), "#", :remote=>true, class: :btn if can? :edit, @neuigkeit %> + <%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %> @@ -10,7 +13,7 @@