diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index f35d236..0eb9e1b 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -258,9 +258,21 @@ div.toolbar-inline > div.dropdown div.btn-toolbar > div.dropdown > ul.dropdown-menu { font-size: small; } -div.toolbar-inline > .ficon.fa-stack { +.fa-stack { +height: 1em;} + .fa-stack-sm > .fa-stack +{postion:relative; +top:-7px; +width:2em; +} + .fa-stack-sm { + height:1em; line-height:1em; width:1em; height:1em; -} \ No newline at end of file +} +.btn.stacked { +padding-left:4px; +padding-right:4px; + } \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5d0cf3c..3310e49 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -54,7 +54,7 @@ m.save 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") + content_tag("span", content_tag("span", content_tag("i","", class: "ficon "+" fa-"+icon1+" fa fa-stack-1x" ) + content_tag("i","", class: "ficon "+" fa-"+icon2+" fa fa-stack-2x" ),class: "fa-stack "),class:"fa-stack-sm") end def ffi1_list diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb index ad6e9dd..7932c57 100644 --- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb @@ -1,27 +1,29 @@
<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit %> - - <%= 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_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 %> + + <%= (link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), title: I18n.t('neuigkeit.publish'), class: "btn") ) if can?(:publish, @neuigkeit) && !@neuigkeit.published? %> + <%= link_to fa_stack("globe","ban"), "#", :remote=>true, class: "btn stacked" if can? :edit, @neuigkeit %> -<%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %> + + +
+ <%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"}) %> -
- <%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"}) %> - -
+