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

AutoCommit Fre Aug 7 10:03:04 CEST 2015

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

4
app/views/news_mailer/neuigkeit_mail.html.erb
View File

@@ -7,5 +7,7 @@
<%= content_tag(:img,"",src: "http://"+ActionMailer::Base.default_url_options[:host].to_s+@neuigkeit.picture.big_thumb.url) %> <%= content_tag(:img,"",src: "http://"+ActionMailer::Base.default_url_options[:host].to_s+@neuigkeit.picture.big_thumb.url) %>
<%=url_for controller: "neuigkeiten",action: :show, :id=>@neuigkeit.id, only_path: false %> <%=url_for controller: "neuigkeiten",action: :show, :id=>@neuigkeit.id, only_path: false %>
<%= raw(@neuigkeit.text) %> <%= raw(@neuigkeit.text) %>
<%= render partial:"survey/questions/mail", object: @neuigkeit.questions.first unless @neuigkeit.questions.empty?%> <% @neuigkeit.questions.each do |q| %>
<%= render partial:"survey/questions/mail", object: q %>
<% end %>
<%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil) %> <%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil) %>

9
app/views/survey/questions/_question.html.erb
View File

@@ -1,6 +1,6 @@
<% if current_user.nil? %> <% if current_user.nil? %>
<%= div_tag_for(question) do%> <%= div_tag_for(question) do%>
<%= render partial: "survey/questions/answeredquestion", object: question %> <%= render partial: "survey/questions/answeredquestion", object: question unless question.flag_delete%>
<% end %> <% end %>
<% else %> <% else %>
<div class="contentbox" id ="<%= divid_for(question) %>" style=""> <div class="contentbox" id ="<%= divid_for(question) %>" style="">
@@ -10,16 +10,17 @@
<%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true %> <%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true %>
<%= flag_link(question, "delete")%> <%= flag_link(question, "delete")%>
<%= flag_link(question, "template")%> <%= flag_link(question, "template")%>
<% unless question.flag_delete %>
<ul class="choice-list"> <ul class="choice-list">
<% question.choices.each do |c| %> <% question.choices.each do |c| %>
<li><%= render c %></li> <li><%= render c %></li>
<% end %> <% end %>
</ul> </ul>
<%= link_to "+" , new_survey_choice_path(params:{question_id: question.id}), remote: true%> <%= link_to "+" , new_survey_choice_path(params:{question_id: question.id}), remote: true%>
<% end %>
</div> </div>
<%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 %> <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 unless question.flag_delete %>
</div> </div>
<% end %> <% end %>

6
app/views/themes/blue2/home/intern.html.erb
View File

@@ -11,12 +11,14 @@
<%= link_to ff_icon("ffi1-setting")+"Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> <%= link_to ff_icon("ffi1-setting")+"Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li> </li>
<li> <li>
<%= link_to ff_icon("fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> <%= link_to ff_icon("fa fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li> </li>
<li> <li>
<%= link_to ff_icon("ffi1-newspaper9")+"Crawler" , crawler_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> <%= link_to ff_icon("ffi1-newspaper9")+"Crawler" , crawler_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li> </li>
<li>
<%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li>
</ul><br> </ul><br>
</div> </div>
<div>Suche nach Protokollen <div>Suche nach Protokollen