From 45b5798e7d8f6e0ae5901378fa588190c00d0e24 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 8 Jun 2015 17:03:02 +0200 Subject: [PATCH] AutoCommit Mon Jun 8 17:03:02 CEST 2015 --- app/assets/stylesheets/themengruppen.css.scss | 4 +- app/controllers/neuigkeiten_controller.rb | 2 + app/helpers/calentries_helper.rb | 4 + app/models/calentry.rb | 12 +- app/views/attachments/refresh_list.js.erb | 6 +- app/views/calentries/_calentry.html.erb | 1 - app/views/calentries/_calentry_list.html.erb | 6 + app/views/calentries/new.js.erb | 2 +- .../neuigkeiten/.#_neuigkeit_view.html.erb | 1 + .../neuigkeiten/_neuigkeit_edit.html.erb | 20 ++- .../neuigkeiten/_neuigkeit_view.html.erb | 21 +-- app/views/neuigkeiten/_show.js.erb | 1 + app/views/neuigkeiten/show.html.erb | 139 ++++++------------ app/views/neuigkeiten/show.js.erb | 4 +- 14 files changed, 96 insertions(+), 127 deletions(-) create mode 100644 app/views/calentries/_calentry_list.html.erb create mode 120000 app/views/neuigkeiten/.#_neuigkeit_view.html.erb create mode 100644 app/views/neuigkeiten/_show.js.erb diff --git a/app/assets/stylesheets/themengruppen.css.scss b/app/assets/stylesheets/themengruppen.css.scss index bbd0ddb..ef430a7 100644 --- a/app/assets/stylesheets/themengruppen.css.scss +++ b/app/assets/stylesheets/themengruppen.css.scss @@ -6,8 +6,10 @@ div.sticker { width: 90%; + border-radius: 5px; text-align: center; - padding: 5px + padding: 5px; +margin:auto; } div.sticker-red { background: red; diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 50634b7..e2d3e17 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -104,6 +104,8 @@ class NeuigkeitenController < ApplicationController def edit @neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit.no_fallbacks=true + @rubrik=@neuigkeit.rubrik + @calentries= @neuigkeit.calentries @calentries<< Calentry.new diff --git a/app/helpers/calentries_helper.rb b/app/helpers/calentries_helper.rb index b46fa94..047f502 100644 --- a/app/helpers/calentries_helper.rb +++ b/app/helpers/calentries_helper.rb @@ -1,2 +1,6 @@ module CalentriesHelper + def render_calentries_for(p) + calentry_list=p.calentries + render(partial: "calentries/calentry_list", object: calentry_list, locals:{parent: p}) + end end diff --git a/app/models/calentry.rb b/app/models/calentry.rb index 2d55bbb..b0908df 100644 --- a/app/models/calentry.rb +++ b/app/models/calentry.rb @@ -89,12 +89,16 @@ end ApplicationController.helpers.fa_icon("calendar 2x") + self.text end def text - if (self.start.to_date - self.ende.to_date) < 1.day - format=:timeonly + if self.start.nil? || self.ende.nil? + "error" else - format =:default + if (self.start.to_date - self.ende.to_date) < 1.day + format=:timeonly + else + format =:default + end + I18n.l(self.start) +" "+ I18n.t("cal.bis")+" "+ I18n.l(self.ende, :format=>format) end - I18n.l(self.start) +" "+ I18n.t("cal.bis")+" "+ I18n.l(self.ende, :format=>format) end scope :public, -> { where(:public => :true) } # scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 28.days.from_now) } diff --git a/app/views/attachments/refresh_list.js.erb b/app/views/attachments/refresh_list.js.erb index d4d1750..4354d7f 100644 --- a/app/views/attachments/refresh_list.js.erb +++ b/app/views/attachments/refresh_list.js.erb @@ -1 +1,5 @@ -$("#<%= Attachment.parent_attachment_list_id(@parent) %>").replaceWith("<%= escape_javascript ( render partial:"attachments/attachment_list", object:@attachments, locals: {editor: true, parent: @parent} ) %>") \ No newline at end of file +$("#<%= 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) %> +<% @neuigkeit=@parent; @rubrik=@neuigkeit.rubrik %> +<%= render "neuigkeiten/show", object: @neuigkeit %> +<% end %> diff --git a/app/views/calentries/_calentry.html.erb b/app/views/calentries/_calentry.html.erb index 787c5de..87cef9f 100644 --- a/app/views/calentries/_calentry.html.erb +++ b/app/views/calentries/_calentry.html.erb @@ -1,5 +1,4 @@
- <% image_tag("/iconnavy/time.png") %> <%= calentry.icon_text %> <% if !(defined? manage) || manage %> <%= link_to "edit", edit_calentry_path(calentry),:remote=>true if can? :edit, calentry %> diff --git a/app/views/calentries/_calentry_list.html.erb b/app/views/calentries/_calentry_list.html.erb new file mode 100644 index 0000000..d308b05 --- /dev/null +++ b/app/views/calentries/_calentry_list.html.erb @@ -0,0 +1,6 @@ +
"> +<% calentry_list.each do |ce|%> +<%= render ce unless ce.nil? %> +<% end %> +
+
" ><%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %>
diff --git a/app/views/calentries/new.js.erb b/app/views/calentries/new.js.erb index bf9c1f6..7d7e082 100644 --- a/app/views/calentries/new.js.erb +++ b/app/views/calentries/new.js.erb @@ -1,3 +1,3 @@ -$("#calentry_new").replaceWith("
<%=escape_javascript( render :partial=>"nested_form" ,:object=>@calentry) %>
"); +$("#calentry_new_<%= @calentry.object.class.to_s + "_" + @calentry.object.id.to_s %>").replaceWith("
\"><%=escape_javascript( render :partial=>"nested_form" ,:object=>@calentry) %>
"); $('.datetimepicker').datetimepicker({format: 'd.m.Y H:i', startDate: (!($(this).attr("value")==undefined))? $(this).attr("value"): ""}) \ No newline at end of file diff --git a/app/views/neuigkeiten/.#_neuigkeit_view.html.erb b/app/views/neuigkeiten/.#_neuigkeit_view.html.erb new file mode 120000 index 0000000..73da42b --- /dev/null +++ b/app/views/neuigkeiten/.#_neuigkeit_view.html.erb @@ -0,0 +1 @@ +andreas@andreas-ThinkPad-S430.3674:1433770009 \ No newline at end of file diff --git a/app/views/neuigkeiten/_neuigkeit_edit.html.erb b/app/views/neuigkeiten/_neuigkeit_edit.html.erb index 7d0798b..13a088e 100644 --- a/app/views/neuigkeiten/_neuigkeit_edit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit_edit.html.erb @@ -1,3 +1,4 @@ +
<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %> @@ -6,7 +7,7 @@ -
+
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %> <%= @neuigkeit.rubrik.name %> @@ -33,23 +34,28 @@
<% end %>
-

- <%= @neuigkeit.title%> edit +

+ <%= @neuigkeit.title%>

<%= raw(@neuigkeit.text) %>
<%= f.input :text, :as=> :hidden %> + <%= f.input :title, :as=> :hidden %>
-<% unless @calentries1.nil? %> - <% @calentries1.each do |ce|%> - <%= render ce unless ce.nil? %> - <% end %> + <% unless neuigkeit_edit.calentries.nil? || neuigkeit_edit.calentries.empty? %> + <% neuigkeit_edit.calentries.each do |ce|%> + <%= render ce , object: ce unless ce.nil? %> + <% end %> <% end %>
+ <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> +
" data-layout="standard" data-action="like" data-show-faces="true" data-share="true">
<% unless @neuigkeit.meeting.nil? %> <%= render @neuigkeit.meeting %> diff --git a/app/views/neuigkeiten/_neuigkeit_view.html.erb b/app/views/neuigkeiten/_neuigkeit_view.html.erb index ac5166a..3658f9b 100644 --- a/app/views/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/neuigkeiten/_neuigkeit_view.html.erb @@ -1,9 +1,9 @@ -
+
-
+
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %> <%= @neuigkeit.rubrik.name %> @@ -31,30 +31,23 @@ <% end %>

- <%= @neuigkeit.title%> + <%= @neuigkeit.title%> <%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(@neuigkeit), remote: true if can? :edit, @neuigkeit %>

<%= raw(@neuigkeit.text) %>
-
- <% @calentries1.each do |ce|%> - <%= render ce unless ce.nil? %> - <% end %> -
+<%= render_calentries_for(@neuigkeit)%> +
" data-layout="standard" data-action="like" data-show-faces="true" data-share="true">
<% unless @neuigkeit.meeting.nil? %> <%= render @neuigkeit.meeting %> <% end%> -
<%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %> -
+ <%= render_attachments_for(@neuigkeit) %> + <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> - <%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %> - <% if can? :find_link , @neuigkeit %> - <%= fa_icon("link")%> Neue Verknüpfungen - <% end %>
diff --git a/app/views/neuigkeiten/_show.js.erb b/app/views/neuigkeiten/_show.js.erb new file mode 100644 index 0000000..d3a1534 --- /dev/null +++ b/app/views/neuigkeiten/_show.js.erb @@ -0,0 +1 @@ +$('#neuigkeit_<%= @neuigkeit.id %>').replaceWith("<%= escape_javascript( render partial:"neuigkeiten/neuigkeit_view", object: @neuigkeit )%>"); diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index 439a8af..4c5daf6 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -1,29 +1,29 @@ <%= content_for :header do %> -Fetsite - <%= @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>) -<% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %> -<% unless @neuigkeit.picture_robust.url.nil? - picture_url=URI(root_url) - picture_url.path=@neuigkeit.picture_robust.url(:locale=>nil, :theme=>nil) -end -%> -<% set_meta_tags :og => { - :image => picture_url.to_s, - :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")", - :type => "article", - :description =>@neuigkeit.text_first_words, -:url=>neuigkeit_url(:theme=>nil) -} -%> + Fetsite - <%= @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>) + <% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %> + <% unless @neuigkeit.picture_robust.url.nil? %> + <% picture_url=URI(root_url) + picture_url.path=@neuigkeit.picture_robust.url(:locale=>nil, :theme=>nil) %> + <% end %> + <% set_meta_tags :og => + { + :image => picture_url.to_s, + :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")", + :type => "article", + :description =>@neuigkeit.text_first_words, + :url=>neuigkeit_url(:theme=>nil) + } + %> + - -<%= display_meta_tags %> + <%= display_meta_tags %> <% end %> <%= render 'rubriken/tabs' %>
- <%= link_to "Refresh", neuigkeit_path(@neuigkeit), remote: true %> - - <%= link_to "Edit", edit_rubrik_neuigkeit_path(@neuigkeit), remote: true if can? :edit, @neuigkeit %> + <%= link_to "Refresh", neuigkeit_path(@neuigkeit), remote: true %>

<%= notice %>

-
- - - - -
- - <%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %> <%= @neuigkeit.rubrik.name %> - - - <% unless @neuigkeit.try(:datum).try(:to_date).nil? %><%= " "+ I18n.t("neuigkeit.am")+" " %> -<% end %> -
- <% unless @neuigkeit.published? %> -
Not Published
<% end %> - <% unless @neuigkeit.origurl.nil? || @neuigkeit.origurl.empty? %> -
<%= link_to "Zitiert von "+ @neuigkeit.origurl, @neuigkeit.origurl %>
- <% end %> -
- <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %> -
-


<%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url) %> -

-
- <% end %> -
-

- <%= @neuigkeit.title%> -

-
- <%= raw(@neuigkeit.text) %> -
-

-
-
-
-<% @calentries1.each do |ce|%> -<%= render ce unless ce.nil? %> -<% end %> + <%= render partial: "neuigkeit_view", object: @neuigkeit %>
-
" data-layout="standard" data-action="like" data-show-faces="true" data-share="true">
- -<% unless @neuigkeit.meeting.nil? %> -<%= render @neuigkeit.meeting %> -<% end%> -
<%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %>
- -<%= %> -<%= render_attachments_for(@neuigkeit) %> -<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
-<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %> +
" data-layout="standard" data-action="like" data-show-faces="true" data-share="true">
+ <% if can? :find_link , @neuigkeit %> -<%= fa_icon("link")%> Neue Verknüpfungen + <%= fa_icon("link")%> Neue Verknüpfungen <% end %> -
- +<%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %> + +
-<% 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| %> -<%= f.input :query, :input_html => { :name => 'query' },:label=>false %> -<% end %> -<%= render partial: 'nlink_list_search_whole', object: @nlink_search %> - -<% end %> + <% 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| %> + <%= f.input :query, :input_html => { :name => 'query' },:label=>false %> + <% end %> + <%= render partial: 'nlink_list_search_whole', object: @nlink_search %> + + <% end %>
- - diff --git a/app/views/neuigkeiten/show.js.erb b/app/views/neuigkeiten/show.js.erb index 580ba82..6cdaf58 100644 --- a/app/views/neuigkeiten/show.js.erb +++ b/app/views/neuigkeiten/show.js.erb @@ -1,3 +1,3 @@ -$('#neuigkeit_<%= @neuigkeit.id %>').replaceWith("<%= escape_javascript( render partial:"neuigkeit_view", object: @neuigkeit )%>"); -alert("reloaded<%= @neuigkeit.id %>"); +<%= render "show" %> +