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

AutoCommit Don Jun 11 11:03:02 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-11 11:03:02 +02:00
parent 9aaacbbb63
commit 34659014df
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/neuigkeit.rb
View File

@@ -140,11 +140,13 @@ class Neuigkeit < ActiveRecord::Base
if self.has_meeting? && !self.meeting.calentry.nil? if self.has_meeting? && !self.meeting.calentry.nil?
self.update_column(:cache_order, (self.meeting.calentry.start.to_date - Date.today).to_i.abs * 1.3) self.update_column(:cache_order, (self.meeting.calentry.start.to_date - Date.today).to_i.abs * 1.3)
self.update_column(:cache_relevant_date, self.meeting.calentry.start.to_date) self.update_column(:cache_relevant_date, self.meeting.calentry.start.to_date)
self.touch
else else
if self.is_event? if self.is_event?
c = self.calentries.min_by{|c| c.days_to_today * 1.3 * ((c.is_past?)? 2:1)} c = self.calentries.min_by{|c| c.days_to_today * 1.3 * ((c.is_past?)? 2:1)}
self.update_column(:cache_order, c.days_to_today * 1.3 * ((c.is_past?)? 2:1)) self.update_column(:cache_order, c.days_to_today * 1.3 * ((c.is_past?)? 2:1))
self.update_column(:cache_relevant_date, (c.is_past?) ? c.ende.to_date : c.start.to_date) self.update_column(:cache_relevant_date, (c.is_past?) ? c.ende.to_date : c.start.to_date)
self.touch
else else
unless self.datum.nil? unless self.datum.nil?
self.update_column(:cache_order, (((self.datum.to_date - Date.today).to_i)).abs) self.update_column(:cache_order, (((self.datum.to_date - Date.today).to_i)).abs)

10
app/views/documents/_search_results.html.erb
View File

@@ -1,12 +1,14 @@
<% unless search_results.nil? %>
<ul> <ul>
<% search_results.hits.each do |hit| %> <% search_results.each_hit_with_result do |hit,result| %>
<li> <li> <%= result.name %>
<% hit.highlights(:name).each do |hlgt| %> <% hit.highlights(:name).each do |hlgt| %>
<%=puts hlgt.format {|word|} "<b>#{word}</b>" %> <%= hlgt.format{|word|"<b>#{word}</b>" } %>
<% end %> <% end %>
<% hit.highlights(:text).each do |hlgt| %> <% hit.highlights(:text).each do |hlgt| %>
<%=%> puts hlgt.format {|word|} "<b>#{word}</b>" %> <%= "text:" + raw(hlgt.format {|word| "*#{word}*" })%>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
</ul> </ul>
<% end %>

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

@@ -1,22 +1,24 @@
<h1> FET Intern NEU </h1> <h1> FET Intern NEU blue2</h1>
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<ul class="linklist"> <ul class="linklist">
<li> <li>
<%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li> <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
<li> <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> </li>
<li>
<%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li> </li>
</ul> </ul>
<div> <div>Suche
<%= semantic_form_for :search,:remote=>true, :url=>search_documents_index_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %> <%= semantic_form_for :search,:remote=>true, :url=>search_documents_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %>
<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %> <%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
<% f.actions do %> <% f.actions do %>
<% f.action :submit, :as => :input %> <% f.action :submit, :as => :input %>
<% end %> <% end %>
<% end %> <% end %>
<div id="searchresults"> <div id="searchresults">
<%= render :partial=>"documents/search_results" %> <%= render :partial=>"documents/search_results", :object=>@results %>
</div> </div>
</div> </div>
<ul class="unstyled linkbox-list"> <ul class="unstyled linkbox-list">