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

AutoCommit Fre Aug 7 11:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-07 11:03:01 +02:00
parent 7419e72eed
commit 3f57e83d49
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/neuigkeiten/_neuigkeit_view.html.erb
View File

@@ -39,15 +39,15 @@
</div>
</div>
<%= render_calentries_for(neuigkeit_view)%>
<%= render_calentries_for(neuigkeit_view)%>
<% unless neuigkeit_view.meeting.nil? %>
<%= render neuigkeit_view.meeting %>
<% end%>
<%= new_question_for(neuigkeit_view) %>
<%= new_question_for(neuigkeit_view) %>
<%= render_attachments_for(neuigkeit_view) %>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>

2
app/views/neuigkeiten/show.html.erb
View File

@@ -50,7 +50,7 @@
<%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %>
<div id="findlink-body"class="ui-dialog" style="">
<div id="findlink-body" class="ui-dialog" style="">
<% if can? :find_link, @neuigkeit %>
Nach Element suchen:
<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} , :remote=> true do |f| %>

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

@@ -1,6 +1,3 @@
<% question_templates.each do |q| %>
<%= link_to q.title, create_from_template_survey_question_path(q, params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %>
<% end %>
<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Neue Frage
@@ -8,8 +5,12 @@
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<li><%= link_to "Neue FRage", new_survey_question_path(params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li><a href="#">Separated link</a></li>
<% question_templates.each do |q| %>
<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}) %>
</li>
<% end %>
</ul>
</div>