Merge branch 'master' of https://github.com/andreassteph/fetsite into andi_spinnt

This commit is contained in:
Thomas Blazek
2015-02-25 10:37:12 +01:00
60 changed files with 585 additions and 210 deletions

View File

@@ -8,6 +8,8 @@
format =:default
end %>
<%= calentry.text %>
<% if !(defined? manage) || manage %>
<%= link_to "edit", edit_calentry_path(calentry),:remote=>true if can? :edit, calentry %>
<%= link_to 'Delete', calentry, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, calentry %>
<% end %>
</div>

View File

@@ -1,31 +1,14 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<%= link_to image_tag(@foto.datei.resized.url), gallery_foto_path(@foto.gallery, ((@foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil?) ? (@foto.gallery.fotos[0].try(:id).to_i) : @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) ) %>
</div>
</div>
<div class="row-fluid">
<div class="span9">
<h2><%= @foto.title %></h2>
<p><%= @foto.desc %></p>
</div>
<div class="span3">
<p>
<%= link_to 'last' , gallery_foto_path(@foto.gallery, @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)-1].try(:id).to_i) unless @foto.gallery.fotos.index(@foto)==0 %>
<%= link_to 'next' , gallery_foto_path(@foto.gallery, @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) unless @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil? %>
<%= link_to 'Edit', edit_foto_path(@foto) %> |
<%= link_to 'Back', gallery_path(@foto.gallery) %>
</p>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<%= image_tag @foto.datei.resized.url, :style=>"margin: auto;
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;" %>
<% #, gallery_foto_path(@foto.gallery, ((@foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil?) ? (@foto.gallery.fotos[0].try(:id).to_i) : @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) ) %>
<div style="position:absolute; bottom:0">
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, @foto.datei.url,
:class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title,:target=>:blank, :style=>"" %>
<p id="notice"><%= notice %></p>
</div>
</div>
</div>

View File

@@ -1,18 +1,26 @@
<%= content_for :header do %>
<title>Fet - Fotos: <%= @gallery.name %></title>
<% end %>
<div itemscope itemtype="http://schema.org/ImageGallery">
<p id="notice"><%= notice %></p>
<div>
<small class="pull-left"><%= @gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> </small>
<small class="pull-right"><%=I18n.l(@gallery.try(:datum).try(:to_date)) unless @gallery.try(:datum).try(:to_date).nil? %></small></br>
<h1>
<small class="pull-right" itemprop="dateCreated" datetime="<%= @gallery.try(:datum).try(:to_date) unless @gallery.try(:datum).try(:to_date).nil?%>"><%=I18n.l(@gallery.try(:datum).try(:to_date)) unless @gallery.try(:datum).try(:to_date).nil? %></small></br>
<h1 itemprop="name">
<%= @gallery.name %>
</h1>
</div>
<p>
<meta itemprop="sameAs" content="<%= gallery_path(@gallery) %>"/>
<p itemprop="description">
<%= @gallery.desc %>
</p>
<style>
.blueimp-gallery > .slides > .slide > .text-content {
overflow: auto;
text-align: left;
}
</style>
<div class="fluid-row">
<div class="span9"> <!-- pagination-->
<div class="pagination pull_left" style="margin:0px 0px 0px 0px">
@@ -78,8 +86,17 @@
<% @fotos_p.each do |f| %>
<div class="left">
<div id="links">
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery>
<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid img-rounded"}) %></a>
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery>
<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid img-rounded"}) %></a>
<div <% if (@openfotoid.to_i==f.id) %> itemprop="primaryImageOfPage"<% else %> itemprop="hasPart" <% end %> itemscope itemtype="http://schema.org/ImageObject">
<a href="<%= gallery_foto_path(f.gallery, f,:params=>{plain: true}) %>" data-type="text/html" title="<%=f.title%>" data-gallery <% if (@openfotoid.to_i==f.id) %>id="openpic" <% end %>>
<%= image_tag(f.datei.thumb.url,{:class=>"img-polaroid img-rounded"}) %>
<meta itemprop="thumbnailUrl" content="<%= f.datei.thumb.url %>"/>
<meta itemprop="dateModified" content="<%= f.updated_at %>"/>
<meta itemprop="image" content="<%= f.datei.url %>"/>
<meta itemprop="sameAs" content="<%= gallery_foto_path(f.gallery, f,:params=>{:plain=>nil, :theme=>nil})%>"/>
</a>
</div>
</div>
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, f.datei.url,
:class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title, rel: 'tooltip' %>
@@ -112,5 +129,29 @@
</div>
<%= @pppage_array[@pppage] %>
<%= javascript_include_tag "blueimp-gallery-all" %>
<script>
blueimp.Gallery.prototype.textFactory = function (obj, callback) {
var $element = $('<div>')
.addClass('slide-content')
.attr('title', obj.title);
$.get(obj.href)
.done(function (result) {
$element.html(result);
callback({
type: 'load',
target: $element[0]
});
})
.fail(function () {
callback({
type: 'error',
target: $element[0]
});
});
return $element[0];
};
$('#openpic').click()
</script>
</div>

View File

@@ -7,7 +7,7 @@
<%= link_to I18n.t("beispiel.add"), new_beispiel_path, :class=>"linkbox"%>
</div>
</div>
<ul class="unstyled linkbox-list" style="margin-top:5px;margin-bottom:5px;">
<ul class="unstyled linklist">
<% @beispiele.each do |b| %>
<li>
<%= link_to b.lva, {:class=> :linkbox} do %>

View File

@@ -1,20 +1,30 @@
<p><%= link_to "Grant extra FB privileges", user_omniauth_authorize_path(:facebook,:params=>{scope:"manage_pages,publish_actions,email"}) %>
</p>
<h1>Administration</h1>
<p>
<%= link_to "user", users_path %>
</p>
<% if Fetsite::Application.config.facebookconfig_enabled %>
<h2>Facebook Konfiguration</h2>
<p><%= link_to "Grant extra FB privileges", user_omniauth_authorize_path(:facebook,:params=>{scope:"manage_pages,publish_actions,email"}), :confirm=>"Wirklich?" %>
</p>
<p>
<%= @fbu.to_yaml.to_s %>
<%= semantic_form_for :set_page, url: fb_set_default_publish_page_user_path(current_user), html:{method: :get} do |f| %>
<%= f.input :page , :input_html => { :name => 'page' }%>
<% end %>
<%= semantic_form_for :set_thema, url: choose_contact_topics_home_index_path, html:{method: :get} do |f| %>
<%= f.input :themen, :input_html=> {:name=>'themen'}, :as=>:select ,:multiple=>true,:collection =>Thema.all%>
<%= f.actions do %>
<%= f.action :submit, :as => :button, :label=> I18n.t("common.save" ) %>
<% end %>
<% end %>
<h2>Kontaktseite, Themen:</h2>
<% @kontaktthemen.each do |tt| %>
<%= render tt %>
<%= link_to "rm" ,choose_contact_topics_home_index_path(:params=>{:rmthema=>tt.id}) %>
<% end %>
<%= semantic_form_for :set_thema, url: choose_contact_topics_home_index_path, html:{method: :get} do |f| %>
<%= f.input :themen, :input_html=> {:name=>'themen'}, :as=>:select ,:multiple=>true,:collection =>Thema.all,:value=>10 %>
<%= f.actions do %>
<%= f.action :submit, :as => :button, :label=> "Hinzufuegen" %>
<% end %>
<% end %>
</p>

View File

@@ -1,3 +1,12 @@
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="content-wrap content-column" style="max-width:100em;">
<h1><%= I18n.t('home.willkommen') %></h1>
<%= render partial: "themen/small", object: @starttopic %>
@@ -24,6 +33,14 @@
</ul>
<% @stickythemen.each do |t1| %>
<li>
<%= link_to t1 do %>
<%= render partial: "themen/nlink", object: t %>
<%= end %>
</li>
<% end %>
<!-- <div class="alert">
<h2>Beta Test</h2>
<p>Die Webseite befindet sich derzeit in einem Entwicklungsstadium,
@@ -48,6 +65,7 @@
</p>
<%= render 'beispiele' %>
<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
</div>
<div class="span7">
<ul class="unstyled linkbox-list" style="margin:5px;">

View File

@@ -0,0 +1 @@
<pre><%= @logs %></pre>

View File

@@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="logo2014_64.png">
<link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>">
<!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
<!---->

View File

@@ -1,5 +1,8 @@
<div class="lva-semester">
<%=lva.lvanr.to_s %> <b><%= link_to lva.full_name, lva_path(lva)%></b> <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
</div>
<div class="lva-semester" style="overflow:auto;">
<span>
<%=lva.lvanr.to_s %> <b><%= link_to lva.full_name, lva_path(lva)%></b>
</span>
<span style="float:right;">
<%= lva.ects %> ECTS / <%= lva.stunden %> Std
</span>
</div>

View File

@@ -5,7 +5,7 @@
<%= link_to "ankündigen", announce_meeting_path(meeting), remote: true if meeting.neuigkeit.nil? %>
<%= link_to "edit", edit_meeting_path(meeting), remote: true %>
<%= link_to 'Delete', meeting, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, meeting %>
<%= render meeting.calentry unless meeting.calentry.nil? %>
<%= render meeting.calentry, locals: {manage: 0} unless meeting.calentry.nil? %>
<%= link_to "Agenda" , create_agenda_meeting_path(meeting), :remote=>true if meeting.agenda.nil? %>
<%= link_to "Protokoll" , create_protocol_meeting_path(meeting),:remote=>true if meeting.protocol.nil? %>
<%= render meeting.agenda unless meeting.agenda.nil? %>

View File

@@ -9,7 +9,7 @@
<%= f.semantic_fields_for :calentry, @meeting.calentry do |ff| %>
<%= ff.input :start, :as => :datetimepicker %>
<%= ff.input :ende, :as => :datetimepicker %>
<%= ff.input :typ %>
<%= ff.input :typ, :as=>:hidden %>
<% ff.input :object_id, :as=>:hidden %>
<% ff.input :object_type %>
@@ -20,4 +20,4 @@
<%= f.action :submit, :as => :input_ %>
<% end %>
<%= @meeting.calentry.to_yaml %>

View File

@@ -1,4 +1,6 @@
$("#<%= @meeting.divid %>").html("<%=escape_javascript( render :partial=>"nested_form" ,:object=>@meeting)%>");
$('.datetimepicker').datetimepicker({format: 'd.m.Y H:i', startDate: (!($(this).attr("value")==undefined))? $(this).attr("value"): ""})

View File

@@ -1,3 +1,5 @@
$("#<%= Meeting.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Meeting.new_divid_for(@parent) %>\"><%=escape_javascript( render :partial=>"nested_form" ,:object=>@meeting) %></div>");
$('.datetimepicker').datetimepicker({format: 'd.m.Y H:i', startDate: (!($(this).attr("value")==undefined))? $(this).attr("value"): ""})

View File

@@ -0,0 +1,12 @@
<%= semantic_form_for [@meetingtyp] do |f| %>
<%= f.inputs do %>
<%= f.input :name, :placeholder=> "Name" %>
<%= f.input :rubrik %>
<%= f.input :agendaintern %>
<%= f.input :protocolintern %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>

View File

@@ -0,0 +1,5 @@
<%= meetingtyp.name %> <%= link_to "edit", edit_meetingtyp_path(meetingtyp) %>
<%= link_to "create" , create_protocol_and_agenda_meetingtyp_path(meetingtyp) %>
<%= render meetingtyp.protocol unless meetingtyp.protocol.nil? %>
<%= render meetingtyp.agenda unless meetingtyp.agenda.nil? %>

View File

@@ -0,0 +1 @@
<%= render "form" %>

View File

@@ -0,0 +1,6 @@
<ul>
<% @meetingtyps.each do |mt| %>
<li><%= render mt %> </li>
<% end %>
</ul>
<%= link_to "New" , new_meetingtyp_path %>

View File

@@ -0,0 +1 @@
<%= render "form" %>

View File

@@ -1,6 +1,8 @@
<span itemprop="memberOf" itemscope itemtype="http://schema.org/Organization">
<%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %>
<%=membership.start.to_s %>
<%= " "+I18n.t("gremium.bis")+" "+membership.stop.to_s unless membership.stop.nil? %>
<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %>
<%= membership.gremium.fall2 %>
<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> <span itemprop="name">
<%= membership.gremium.fall2 %></span>
<meta itemprop="sameAs" content="<%= gremium_path(membership.gremium, :theme=>nil)%>"/>
</span>

View File

@@ -1,4 +1,3 @@
<div class="media">
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>

View File

@@ -3,7 +3,7 @@
<% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %>
<% unless @neuigkeit.picture.url.nil?
picture_url=URI(root_url)
picture_url.path=@neuigkeit.picture.url
picture_url.path=@neuigkeit.picture.url(:locale=>nil, :theme=>nil)
end
%>
<% set_meta_tags :og => {
@@ -14,42 +14,64 @@ end
:url=>neuigkeit_url(:theme=>nil)
}
%>
<% set_meta_tags :og=>{:article=> {:published_time=>I18n.l(@neuigkeit.try(:datum).try(:to_date)) }} unless @neuigkeit.try(:datum).try(:to_date).nil? %>
<%= display_meta_tags %>
<% end %>
<%= render 'rubriken/tabs' %>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="content-column content-wrap">
<p id="notice"><%= notice %></p>
<div class="contentbox">
<span>
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %>
</span>
<span class="pull-right">
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= @neuigkeit.author.text+ " "+ I18n.t("neuigkeit.am")+" " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
</span>
<div class="media">
<% unless @neuigkeit.picture.big_thumb.to_s.empty? %>
<div class="pull-left" href="#">
<p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.try(:url) %>
</p>
</div>
<p id="notice"><%= notice %></p>
<div class="contentbox" itemscope itemtype="http://schema.org/Article">
<meta itemprop="about" content="<%= @neuigkeit.text_first_words %>"/>
<meta itemprop="sameAs" content="<%= neuigkeit_url(@neuigkeit,:theme=>nil)%>"/>
<div class="row-fluid">
<span itemprop="articleSection">
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %>
</span>
<span class="pull-right">
<span itemprop="author"><%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= @neuigkeit.author.text %></span><% unless @neuigkeit.try(:datum).try(:to_date).nil? %><%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(@neuigkeit.try(:datum).try(:to_date)) %>
</span>
<% end %>
<div class="media-body">
<h1>
<%= @neuigkeit.title%>
</h1>
<%= raw(@neuigkeit.text) %>
<p></p>
</div>
</div>
<div id="calentries">
</div>
<% unless @neuigkeit.published? %>
<div class="sticker sticker-red"> Not Published</div> <% end %>
<div class="media">
<% unless @neuigkeit.picture.big_thumb.to_s.empty? %>
<div class="pull-left" href="#">
<p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.try(:url) %>
</p>
</div>
<% end %>
<div class="media-body">
<h1 itemprop="name">
<%= @neuigkeit.title%>
</h1>
<div itemprop="articleBody">
<%= raw(@neuigkeit.text) %>
</div>
<p></p>
</div>
</div>
<div id="calentries">
<% @calentries1.each do |ce|%>
<%= render ce unless ce.nil? %>
<% end %>
</div>
<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit)%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
<% unless @neuigkeit.meeting.nil? %>
<%= render @neuigkeit.meeting %>
<% end%>
@@ -74,6 +96,8 @@ Nach Element suchen:
<% end %>
</div>
<script>
$(function(){
dialog = $( "#findlink-body" ).dialog({

View File

@@ -5,8 +5,7 @@
<td><%= fa_icon "globe" if r.public%></td>
<td><%= r.name %></td>
<td>
<%= n.title %>
<%= link_to n.title, n %>
</td>
<td>
<%= unless n.datum.nil?

View File

@@ -12,6 +12,9 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Actions</a>
<ul class="dropdown-menu">
<li>
<%= link_to ff_icon("icon-pencil")+"Make Titlepic", set_titlepic_thema_attachment_path(a.thema,a,:params=>{:titlepic=>true}) %>
</li>
<li>
<%= link_to ff_icon("icon-pencil")+"Edit", edit_thema_attachment_path(a.thema,a) %>
</li><li>
<%= link_to "Delete Attachment", thema_attachment_path(a.thema,a), method: "DELETE", confirm: "Sure?" , class: "btn-danger " %>

View File

@@ -1,3 +1,12 @@
<div>
<b>Titlepics</b>
<%= render :partial=>"attachments/form_bulk" %>
<% @thema.titlepics.each do |tp| %>
<%= link_to image_tag(tp.datei.thumb.url) , set_titlepic_thema_attachment_path(tp.thema,tp,:params=>{:titlepic=>false}) %>
<% end %></div>
<b> List </b>
<%= render partial: "themen/attachment_list", object:@thema.attachments ,locals: {:editor => true}%>
<div>
<b>Form</b>
<%= render :partial=>"attachments/form_bulk" %>
</div>

View File

@@ -21,6 +21,8 @@
</div>
<div class="span4">
<%= f.input :hideattachment %>
<%= f.input :sticky_intern %>
<%= f.input :sticky_startpage %>
</div>

View File

@@ -1,7 +1,8 @@
<% if can? :show, small %>
<a name="thema_<%=small.id%>" href="#<%=small.id%>">
<h2><%= small.title %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %> </h2>
<h2><%= link_to small.title,small %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %> </h2>
</a>
<%= image_tag small.titlepics.first.datei.url unless small.titlepics.first.nil? %>
<% if small.is_outdated? %>
<div class="sticker sticker-red"> <%= I18n.t("thema.outdated") %> <%= link_to"Als aktuell markieren",is_updated_thema_path(small), :class=>:btn if can? :is_updated, small%></div>
<% end %>
@@ -26,8 +27,10 @@
<b>Treffen/Sitzungen</b>
<%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Meeting.new_divid_for(small) %>"></div>
<%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
<ul class="nav nav-tabs">
<li><%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true if small.meetings.accessible_by(current_ability).count >0 %></li>
<li><%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true if small.meetings.accessible_by(current_ability).upcomming.count >0 %></li>
</ul>
<%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
<% end %>

View File

@@ -1,25 +1,12 @@
<h1>Listing themen</h1>
<table>
<tr>
<th>Title</th>
<th>Text</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @themen.each do |thema| %>
<tr>
<td><%= thema.title %></td>
<td><%= thema.text %></td>
<td><%= link_to 'Show', thema %></td>
<td><%= link_to 'Edit', edit_thema_path(thema) %></td>
<td><%= link_to 'Destroy', thema, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<h1>Listing theme1n</h1><h2>drafts </h2>
<% @themen_drafts.each do |thema| %>
<%= render partial:"themen/nlink", object: thema %>
<% end %>
</table>
<h2>All</h2>
<% @themen.each do |thema| %>
<%= render partial:"themen/nlink", object: thema %>
<% end %>
<br />
<%= link_to 'New Thema', new_thema_path %>

View File

@@ -1,8 +1,54 @@
<p id="notice"><%= notice %></p>
<%= link_to "Zurück", @thema.themengruppe %>
<br>
<div class="contentbox">
<%= render :partial=>"themen/small", :object=>@thema %>
</div>
<%= render :partial=>'layouts/pretty_toolbar' %>
<%= content_for :header do %>
<title><%= @thema.title.to_s + " (" + @thema.themengruppe.title.to_s + ")" %></title>
<%
mog = {
:title => @thema.title.to_s + " (" + @thema.themengruppe.title.to_s + ")",
:type => "article",
:description =>@thema.text_first_words,
:url=>thema_url(:theme=>nil)
}
%>
<%
unless @thema.titlepics.first.nil?
picture_url=URI(root_url)
picture_url.path=@thema.titlepics.first.datei.url(:locale=>nil, :theme=>nil)
mog[:image]= picture_url
end
%>
<%= display_meta_tags :og=> mog %>
<% end %>
<p id="notice"><%= notice %></p>
<% link_to "Zurück", @thema.themengruppe %>
<% thema=@thema %><div class="content-wrap content-column" >
<div class="contentbox">
<%= render :partial => 'themen/small', :object => thema %>
<ul class="unstyled">
<% unless thema.gremium.nil? %>
<li>
<%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
</li>
<% end %>
<% thema.nlinks.each do |l| %>
<li>
<%= render l.neuigkeit if can? :show, l.neuigkeit%>
</li>
<% end %>
</ul>
</div>
<br>
<div class="">
<%= render @thema.themengruppe %>
</div>
</div>
<% # render :partial=>'layouts/pretty_toolbar' %>

View File

@@ -1 +1,14 @@
<h2><%= nlink.title %> </h2>
<% themengruppe=nlink %>
<h3>
<% unless themengruppe.icon.nil? or themengruppe.icon.empty? %> <i class="<%= themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
<% end %>
<%= themengruppe.title%> </h3>
<p>
<%= if themengruppe.text.split.size > Themengruppe::WORD_COUNT
themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
else
themengruppe.text
end%>
</p>

View File

@@ -2,16 +2,17 @@
<div class="content-wrap content-column">
<% @themengruppen.each do |tg| %>
<% if can?(:show, tg) %>
<% themen = tg.themen.accessible_by(current_ability, :show).order(:priority).reverse_order.select{|t| !t.fragen.empty?} %>
<% if can?(:show, tg) && !themen.empty? %>
<div class="contentbox">
<a name="themengruppe_<%=tg.id.to_s%>"></a>
<h2> <%= tg.title%></h2>
<ul>
<% tg.themen.order(:priority).reverse.each do |t| %>
<% if can?(:show, t) %>
<% if can?(:show, t) && !t.fragen.empty? %>
<li> <%= t.title %>
<ul>
<% t.fragen.each do |f| %>
<% t.fragen.order(:title).each do |f| %>
<li>
<b> <%= f.title %>?</b>
<p> <%= raw(f.text) %></p>

View File

@@ -1,11 +1,20 @@
<div class="content-wrap content-column">
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="content-wrap content-column" style="max-width:90em;">
<h1><%= I18n.t('home.willkommen') %></h1>
<%= raw(@starttopic.text) %>
<div class="container-fluid">
<div class="row-fluid">
<div class="span6">
<div class="span5">
<ul class="linklist">
<li>
@@ -21,8 +30,19 @@
</li>
<li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox %></li>
<li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
</ul>
<ul class="linklist">
<% @stickythemen.each do |t1| %>
<li>
<%= link_to t1,:class=>:linkbox do %>
<%= render partial: "themen/nlink", object: t1 %>
<% end %>
</li>
<% end %>
</ul>
<!-- <div class="alert">
<h2>Beta Test</h2>
@@ -46,24 +66,15 @@
</div>-->
</p>
<%= render 'beispiele' %>
<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
</div>
<div class="span6">
<ul class="unstyled linkbox-list" style="max-width:70em">
<div class="span7">
<ul class="unstyled linklist">
<% @neuigkeiten.each do |n| %>
<li><%= render n if can?(:show, n) %> </li>
<% end %>
</ul>
Verschiedene Styles
<ul>
<li> <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %></li>
<li> <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %></li>
<li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li>
<li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li>
</ul>
</ul>
</div>
</div>
</div>