andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Mon Jun 8 18:03:05 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-08 18:03:05 +02:00
parent 45b5798e7d
commit 18021fb502
7 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/themengruppen.css.scss
View File

@@ -12,7 +12,7 @@ div.sticker
margin:auto; margin:auto;
} }
div.sticker-red div.sticker-red
{ background: red; { border:solid red;
} }
div.sticker-yellow div.sticker-yellow
{ background: yellow; { background: yellow;

6
app/assets/stylesheets/themes/blue2/application.css.scss
View File

@@ -43,7 +43,7 @@ $linkColor: $color_prim;
$linkColorHover: $color_schema_1; $linkColorHover: $color_schema_1;
$white: #FFFFFF; $white: #FFFFFF;
$bodyBackground: #FEFEFE; $bodyBackground: #FFF; //#FEFEFE;
@@ -116,7 +116,7 @@ $navbar-li-minwidth: 0;
$box-border: lightgray solid 1px; $box-border: lightgray solid 1px;
$box-border-radius:0px; $box-border-radius:4px;
$box-background: white; $box-background: white;
@import 'layout'; @import 'layout';
@@ -125,6 +125,6 @@ $box-background: white;
@import 'extra'; @import 'extra';
body { body {
background: #EFEFEF; background: #FFF; //#EFEFEF;
background-size:100%; background-size:100%;
} }

4
app/views/attachments/refresh_list.js.erb
View File

@@ -1,5 +1,5 @@
$("#<%= Attachment.parent_attachment_list_id(@parent) %>").replaceWith("<%= escape_javascript ( render partial:"attachments/attachment_list", object:@attachments, locals: {editor: true, parent: @parent} ) %>") $("#<%= Attachment.parent_attachment_list_id(@parent) %>").replaceWith("<%= escape_javascript ( render partial:"attachments/attachment_list", object:@attachments, locals: {editor: true, parent: @parent} ) %>")
<% if @parent.is_a?(Neuigkeit) %> <% if @parent.is_a?(Neuigkeit) %>
<% @neuigkeit=@parent; @rubrik=@neuigkeit.rubrik %> <% @neuigkeit=@parent %>
<%= render "neuigkeiten/show", object: @neuigkeit %> <%= render "neuigkeiten/show", object: @parent, locals: {show: @parent} %>
<% end %> <% end %>

21
app/views/neuigkeiten/_neuigkeit_edit.html.erb
View File

@@ -35,7 +35,7 @@
<% end %> <% end %>
<div class="media-body"> <div class="media-body">
<h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title"> <h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title">
<%= @neuigkeit.title%> <%= raw(@neuigkeit.title) %>
</h1> </h1>
<div itemprop="articleBody" class="editable" data-target="#neuigkeit_text"> <div itemprop="articleBody" class="editable" data-target="#neuigkeit_text">
<%= raw(@neuigkeit.text) %> <%= raw(@neuigkeit.text) %>
@@ -45,13 +45,7 @@
</div> </div>
</div> </div>
<div id="calentries">
<% unless neuigkeit_edit.calentries.nil? || neuigkeit_edit.calentries.empty? %>
<% neuigkeit_edit.calentries.each do |ce|%>
<%= render ce , object: ce unless ce.nil? %>
<% end %>
<% end %>
</div>
<%= f.actions do %> <%= f.actions do %>
<%= f.action :submit, :as => :input %> <%= f.action :submit, :as => :input %>
<% end %> <% end %>
@@ -60,17 +54,12 @@
<% unless @neuigkeit.meeting.nil? %> <% unless @neuigkeit.meeting.nil? %>
<%= render @neuigkeit.meeting %> <%= render @neuigkeit.meeting %>
<% end%> <% end%>
<div id="calentry_new" ><%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %> <% end%>
</div>
<%= render_attachments_for(@neuigkeit) %>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
<% if can? :find_link , @neuigkeit %>
<a id="findlink-open" href="#"><%= fa_icon("link")%> Neue Verknüpfungen </a>
<% end %>
<% end %>
</div> </div>
<%= tinymce :inline_div %> <%= tinymce :inline_div %>
<%= tinymce :inline_simple %> <%= tinymce :inline_simple %>

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

@@ -1,53 +1,52 @@
<div id="neuigkeit_<%= neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article"> <div id="neuigkeit_<%= neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
<meta itemprop="about" content="<%= @neuigkeit.text_first_words %>"/> <meta itemprop="about" content="<%= neuigkeit_view.text_first_words %>"/>
<meta itemprop="sameAs" content="<%= neuigkeit_url(@neuigkeit,:theme=>nil)%>"/> <meta itemprop="sameAs" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
<meta itemprop="url" content="<%= neuigkeit_url(@neuigkeit,:theme=>nil)%>"/> <meta itemprop="url" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
<div class="media"> <div class="media">
<span itemprop="articleSection"> <span itemprop="articleSection">
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %> <%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %>
</span> </span>
<span class="pull-right"> <span class="pull-right">
<span itemprop="author"><%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> <span itemprop="author"><%= neuigkeit_view.author.email.to_s unless neuigkeit_view.try(:author).try(:email).to_s %>
<%= @neuigkeit.author.text %></span> <%= neuigkeit_view.author.text %></span>
<% unless @neuigkeit.try(:datum).try(:to_date).nil? %> <% unless neuigkeit_view.try(:datum).try(:to_date).nil? %>
<%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(@neuigkeit.try(:datum).try(:to_date)) %> <%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(neuigkeit_view.try(:datum).try(:to_date)) %>
</span> </span>
<% end %> <% end %>
</div> </div>
<% unless @neuigkeit.published? %> <% unless neuigkeit_view.published? %>
<div class="sticker sticker-red"> Not Published</div> <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),remote:true, class: :btn if can? :publish, neuigkeit_view %></div>
<% end %> <% end %>
<% unless @neuigkeit.origurl.nil? || @neuigkeit.origurl.empty? %> <% unless neuigkeit_view.origurl.nil? || neuigkeit_view.origurl.empty? %>
<div class="alert"><%= link_to "Zitiert von "+ @neuigkeit.origurl, @neuigkeit.origurl %> <div class="alert"><%= link_to "Zitiert von "+ neuigkeit_view.origurl, neuigkeit_view.origurl %>
</div> </div>
<% end %> <% end %>
<div class="media"> <div class="media">
<% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %> <% unless neuigkeit_view.picture_robust.big_thumb.to_s.empty? %>
<div class="pull-left" href="#"> <div class="pull-left" href="#">
<p><br><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url) %> <p><br><%= link_to image_tag(neuigkeit_view.picture_robust.big_thumb.url),neuigkeit_view.picture_robust.try(:url) %>
</p> </p>
</div> </div>
<% end %> <% end %>
<div class="media-body"> <div class="media-body">
<h1 itemprop="name"> <h1 itemprop="name">
<%= @neuigkeit.title%> <%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(@neuigkeit), remote: true if can? :edit, @neuigkeit %> <%= 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.text) %> <%= raw(neuigkeit_view.text) %>
</div> </div>
</div> </div>
</div> </div>
<%= render_calentries_for(@neuigkeit)%> <%= render_calentries_for(neuigkeit_view)%>
<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div> <% unless neuigkeit_view.meeting.nil? %>
<% unless @neuigkeit.meeting.nil? %> <%= render neuigkeit_view.meeting %>
<%= render @neuigkeit.meeting %>
<% end%> <% end%>
<%= render_attachments_for(@neuigkeit) %> <%= render_attachments_for(neuigkeit_view) %>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div> </div>

3
app/views/neuigkeiten/_show.js.erb
View File

@@ -1 +1,2 @@
$('#neuigkeit_<%= @neuigkeit.id %>').replaceWith("<%= escape_javascript( render partial:"neuigkeiten/neuigkeit_view", object: @neuigkeit )%>"); <% show = @neuigkeit %>
$('#neuigkeit_<%= show.id %>').replaceWith("<%= escape_javascript( render partial:"neuigkeiten/neuigkeit_view", object: show )%>");

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

@@ -1,3 +1,3 @@
<%= render "show" %> <%= render "show", object: @neuigkeit %>