diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 881e9a1..5239999 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -62,7 +62,7 @@ u=current_user if ! u.try(:preferredtheme).nil? and ThemesForRails.available_theme_names.include?(u.preferredtheme) u.preferredtheme else - "blue1" + "blue2" end end diff --git a/app/models/document.rb b/app/models/document.rb index 5123b52..a789d95 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -70,13 +70,21 @@ class Document < ActiveRecord::Base end def move_to_etherpad unless self.is_etherpad? || self.id.nil? - self.etherpadkey="document_"+ self.id.to_s - self.ep_pad.html = '
'+self.text+'
' + self.etherpadkey="document_"+ self.id.to_s + if self.text.nill? + self.ep_pad.html = '
'+"text"+'
' + else + self.ep_pad.html = '
'+self.text+'
' + end end end def dump_to_etherpad if self.is_etherpad? - self.ep_pad.html = '
'+self.text+'
' + if self.text.nill? + self.ep_pad.html = '
'+"text"+'
' + else + self.ep_pad.html = '
'+self.text+'
' + end else self.move_to_etherpad end diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index 0e5705d..5a06936 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -22,7 +22,9 @@ <% end %> diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 7b50b96..f9d564c 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -145,7 +145,7 @@ end <%= 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' %> + :class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title.to_s, rel: 'tooltip' %> <%= link_to ff_icon('icon-remove-circle').html_safe, gallery_foto_path(@gallery, f), :method => :delete, :class=>"btn-small btn-danger",title: I18n.t('fotos.delete')+': '+f.title, rel: 'tooltip', confirm: I18n.t('fotos.delete')+': '+f.title+', Sicher?' if can?(:delete,f) %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 52b01f4..1bde762 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,7 +3,7 @@ - "> + diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb index f4c6301..438c076 100755 --- a/app/views/rubriken/index.html.erb +++ b/app/views/rubriken/index.html.erb @@ -33,7 +33,7 @@ - + <% unless @calentries.nil? or @calentries.empty? or True%>
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %> @@ -42,7 +42,7 @@ <% if !current_user.nil? and current_user.has_role?(:fetuser) %> <%= link_to calendars_url(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%> <% end %> -
+ <% end %> diff --git a/app/views/themes/blue2/layouts/application.html.erb b/app/views/themes/blue2/layouts/application.html.erb index 533cfef..c97572a 100755 --- a/app/views/themes/blue2/layouts/application.html.erb +++ b/app/views/themes/blue2/layouts/application.html.erb @@ -2,7 +2,7 @@ - "> + diff --git a/app/views/themes/blue2/lvas/show.html.erb b/app/views/themes/blue2/lvas/show.html.erb index d3c5e7d..84f6ed2 100755 --- a/app/views/themes/blue2/lvas/show.html.erb +++ b/app/views/themes/blue2/lvas/show.html.erb @@ -82,9 +82,12 @@
<%= new_question_for(@lva) %> + <% unless @questions.nil? %> <% @questions.each do |q| %> <%= render q if can? :show, q %> <% end %> + <% end %> +

<%= I18n.t("lva.bspe") %>