bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Fre Aug 21 20:03:03 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-21 20:03:03 +02:00
parent 6102587cab
commit c396c7410e
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,3 +250,11 @@ font-size:1em;
a.choice > i {font-size: 32px} a.choice > i {font-size: 32px}
span.highcharts-axis-labels > i { span.highcharts-axis-labels > i {
font-size:32px} font-size:32px}
div.toolbar-inline > div.dropdown
{ display:inline;
}
div.btn-toolbar > div.dropdown > ul.dropdown-menu
{ font-size: small;
}

4
app/helpers/survey/questions_helper.rb
View File

@@ -1,5 +1,5 @@
module Survey::QuestionsHelper module Survey::QuestionsHelper
def new_question_for(obj) def new_question_for(obj,t="Neue Frage")
render partial: "survey/questions/new_question", locals: {question_templates: Survey::Question.templates, parent: obj} render partial: "survey/questions/new_question", locals: {question_templates: Survey::Question.templates, parent: obj, text: t}
end end
end end

5
app/views/survey/questions/_new_question.html.erb
View File

@@ -1,12 +1,13 @@
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Neue Frage <%= text %>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<li> <li>
<%= link_to "Neue FRage", new_survey_question_path(params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %> <%= link_to "Neue Frage", new_survey_question_path(params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %>
</li> </li>
<li>Templates:</li>
<% question_templates.each do |q| %> <% question_templates.each do |q| %>
<li> <li>
<%= link_to q.title, create_from_template_survey_question_path(q, params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %> <%= link_to q.title, create_from_template_survey_question_path(q, params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %>

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

@@ -1,22 +1,11 @@
<div class="toolbar-inline">
<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn") 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" 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 %>
</span> </span>
<% if can?(:edit, @neuigkeit) %> <%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %>
<div class="dropdown" style="display:inline">
<%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %>
<ul class="dropdown-menu">
<li>
</li>
</ul>
</div>
<% end %>
<%= new_question_for(@neuigkeit) if can? :new, Survey::Question %>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a> <a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
@@ -29,6 +18,7 @@
<div class="ui-dialog" id="attachments-form"> <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>
<script> <script>
$(function(){ $(function(){

2
app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
View File

@@ -39,7 +39,7 @@
<% end %> <% end %>
<div class="media-body"> <div class="media-body">
<h1 itemprop="name"> <h1 itemprop="name">
<%= raw(neuigkeit_view.title) %> <%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %> <%= raw(neuigkeit_view.title) %> <%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %>
</h1> </h1>
<div itemprop="articleBody"> <div itemprop="articleBody">
<%= raw(neuigkeit_view.text) %> <%= raw(neuigkeit_view.text) %>