andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Fre Aug 21 22:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-21 22:03:01 +02:00
parent bfe65e14e3
commit c8e8a0d229
3 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/stylesheets/layout.css.scss
View File

@@ -258,9 +258,21 @@ div.toolbar-inline > div.dropdown
div.btn-toolbar > div.dropdown > ul.dropdown-menu div.btn-toolbar > div.dropdown > ul.dropdown-menu
{ font-size: small; { 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; height:1em;
line-height:1em; line-height:1em;
width:1em; width:1em;
height:1em; height:1em;
} }
.btn.stacked {
padding-left:4px;
padding-right:4px;
}

2
app/helpers/application_helper.rb
View File

@@ -54,7 +54,7 @@ m.save
end end
def fa_stack(icon1, icon2) 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 end
def ffi1_list def ffi1_list

26
app/views/themes/blue2/neuigkeiten/_menu.html.erb
View File

@@ -1,27 +1,29 @@
<div class="toolbar-inline"> <div class="toolbar-inline">
<%= 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("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit %>
<span class="btn-group"> <span class="btn-group">
<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open", title: "Attachments" 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("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 %> </span>
</span> <%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %>
<span class=" pull-right">
<%= (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 %> <div class="dropdown" style=" display:inline"">
<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%><span class="caret"></span></a>
<div class="dropdown pull-right">
<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? %> <%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? %>
<%= li_tag(link_to(ff_icon("icon-plus")+ I18n.t('neuigkeit.publish'), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)) )%>
</ul>
</div>
<div class="ui-dialog" id="attachments-form"> <%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? %>
</ul>
</div>
</span>
<div class="ui-dialog" id="attachments-form">
<%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"}) %> <%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"}) %>
</div> </div>
</div> </div>
<script> <script>
$(function(){ $(function(){