[^\<\>]*)/.match Sanitize.clean(self.text,:elements=>['p'])
words=md[:text].split(" ") unless md.nil?
@@ -68,15 +72,15 @@ end
end
end
-def has_calentries?
-!self.calentries.nil? && !self.calentries.empty?
-end
-private
-def sanitize
-self.calentries.each do |calentry|
-calentry.calendar= self.rubrik.calendar
-calentry.typ=1
-calentry.object=self
-end
-end
+ def has_calentries?
+ !self.calentries.nil? && !self.calentries.empty?
+ end
+ private
+ def sanitize
+ self.calentries.each do |calentry|
+ calentry.calendar= self.rubrik.calendar
+ calentry.typ=1
+ calentry.object=self
+ end
+ end
end
diff --git a/app/models/rubrik.rb b/app/models/rubrik.rb
index 74340d2..ca4bfec 100755
--- a/app/models/rubrik.rb
+++ b/app/models/rubrik.rb
@@ -11,7 +11,7 @@
#
class Rubrik < ActiveRecord::Base
- attr_accessible :desc, :name, :prio, :calendar, :public
+ attr_accessible :desc, :name, :prio, :calendar, :public, :icon, :color
has_many :neuigkeiten, :class_name => "Neuigkeit"
has_many :published, :class_name => "Neuigkeit", :conditions=>["Neuigkeit.published"]
has_many :calentries, :through => :neuigkeiten, :as=>:object
diff --git a/app/models/thema.rb b/app/models/thema.rb
index c32149c..3f73b38 100644
--- a/app/models/thema.rb
+++ b/app/models/thema.rb
@@ -9,9 +9,10 @@
# updated_at :datetime not null
# themengruppe_id :integer
#
-
+require 'uri'
class Thema < ActiveRecord::Base
- attr_accessible :text, :title, :themengruppe_id
+include Rails.application.routes.url_helpers
+ attr_accessible :text, :title, :themengruppe_id,:isdraft, :hidelink, :hideattachment
has_many :fragen
has_many :attachments
belongs_to :themengruppe, :foreign_key => "themengruppe_id"
@@ -20,9 +21,21 @@ class Thema < ActiveRecord::Base
validates :themengruppe, :presence => true
validates :title, :presence => true
validates :text, :presence => true
- scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
- translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
+ scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
+ scope :outdated, -> {includes(:translations).where("thema_translations.updated_atI18n.t.locale)
+}
+ translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
+ def is_outdated?
+ unless translation.try(:updated_at).nil?
+ translation.updated_at < 2.month.ago
+ else
+ false
+ end
+ end
+ def is_wiki?
+ !(wikiname.nil? || wikiname.empty?)
+ end
def text_first_words
md = /(?[^\<\>]*)/.match Sanitize.clean(self.text,:elements=>['p'])
words=md[:text].split(" ") unless md.nil?
@@ -34,4 +47,10 @@ class Thema < ActiveRecord::Base
end
end
+ def fix_links(host)
+ full_url= URI.parse(root_url(:host=>host))
+ self.text.gsub!(/src="[^"]*attachment\/datei\/(\d+)[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.url; 'src="'+full_url.to_s+'"'}
+ self.text.gsub!(/href="[^"]*themen\/(\d+)[^"]*"/){|s| full_url.path=thema_path(Thema.find($1.to_i)); 'href="'+full_url.to_s+'"'}
+
+ end
end
diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb
index ca42007..8b22b5d 100644
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -10,7 +10,7 @@
class Themengruppe < ActiveRecord::Base
WORD_COUNT = 50
- attr_accessible :text, :title, :picture, :priority
+ attr_accessible :text, :title, :picture, :priority, :public, :icon
has_many :themen, class_name: 'Thema'
has_many :fragen, through: :themen
@@ -20,4 +20,20 @@ class Themengruppe < ActiveRecord::Base
validates :text, :presence => true
translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
+
+ scope :intern,-> {where(:public=>false)}
+ scope :public,-> {where(:public=>true)}
+
+ def self.find_wiki_default
+ where(:wiki_default=>true).first
+ end
+ def intern
+ ! self.public
+end
+ def make_wiki_default
+ Themengruppe.where(:wiki_default=>:true).update_all(:wiki_default=>:false)
+ self.wiki_default=true;
+ self.save;
+ end
+
end
diff --git a/app/models/user.rb b/app/models/user.rb
index ea6c46b..bcc6096 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,7 +30,7 @@ class User < ActiveRecord::Base
# :token_authenticatable, :confirmable,
# :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable,:omniauthable, :omniauth_providers => [:facebook,:ldap]
-
+ acts_as_voter
# Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name
belongs_to :fetprofile
@@ -38,39 +38,32 @@ belongs_to :fetprofile
def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
logger.debug auth.to_s
logger.debug "DDD Username= #{auth.username}"
- # user = User.where(:provider => auth.provider, :uid => auth.uid).first
+ user = User.where(:provider => auth.provider, :uid => auth.uid).first
unless user
- user = User.create(name:auth.uid,
+ user = User.create(name: auth.uid,
provider:auth.provider,
- uid:auth.uid,
+ uid: auth.uid,
email:auth.info.email,
password:Devise.friendly_token[0,20]
)
end
+
user
end
- def self.find_for_ldap_oauth(auth,signed_in_resource=nil)
- # debug "sdfg"
+ def self.find_for_ldap_oauth(auth,signed_in_resource=nil)
+ # debug "sdfg"
- user= User.where(:provider=>auth.provider,:uid=>auth.extra.raw_info.uid).first
- unless user
- user= User.create(name:auth.extra.raw_info.uid.first,
- provider:auth.provider,
- uid:auth.extra.raw_info.uid.first,
- email:auth.extra.raw_info.mail.first.to_s,
- password:Devise.friendly_token[0,20])
- user.add_role("fetuser")
-logger.debug(auth.extra.raw_info.to_s)
- end
- unless user
- # user=User.create(name:"fail",
- # provider:"ldap",
- # uid:"sdf",
- # email:"sdf@fet.at",
- # password:Devise.friendly_token[0,20])
-
- end
+ user= User.where(:provider=>auth.provider,:uid=>auth.extra.raw_info.uid).first
+ unless user
+ user= User.create(name:auth.extra.raw_info.uid.first,
+ provider:auth.provider,
+ uid:auth.extra.raw_info.uid.first,
+ email:auth.extra.raw_info.mail.first.to_s,
+ password:Devise.friendly_token[0,20])
+ user.add_role("fetuser")
+ logger.debug(auth.extra.raw_info.to_s)
+ end
user
end
diff --git a/app/models/wiki.rb b/app/models/wiki.rb
new file mode 100644
index 0000000..23cd374
--- /dev/null
+++ b/app/models/wiki.rb
@@ -0,0 +1,73 @@
+class Wiki < Thema
+ validates :wikiname, :uniqueness=>true, :presence=>true
+ after_initialize :load_wiki
+ attr_accessible :wikiname, :wikiformat, :hidelink, :raw_data
+ WIKIFORMATS={nil=> :textile, 0 =>:textile, 1=> :mediawiki}
+
+ def self.find_or_init(name)
+ w = Wiki.where(:wikiname=>name).first
+ page = is_file_availaible(name)
+ if w.nil?
+ unless page.nil?
+ w=Wiki.new(:wikiname=>name, :title=>name, :wikiformat=>Wiki::WIKIFORMATS.invert[page.format], :hidelink=>true)
+ else
+ w=Wiki.new(:wikiname=>name, :title=>name, :wikiformat=>0, :hidelink=>true)
+ wiki = Gollum::Wiki.new("../wiki.git", :base_path => "/wiki")
+ page=wiki.write_page(name, :textile, "ioi", self.commit)
+ w.reload_page
+ end
+
+ w.themengruppe = Themengruppe.find_wiki_default
+ w.raw_data="Neues Wiki"
+ w.save
+ end
+ w
+ end
+
+ def raw_data
+ self.page.raw_data
+ end
+
+ def raw_data=(data)
+ self.get_page(self.wikiname)
+ self.wiki.update_page(self.page, self.wikiname, Wiki::WIKIFORMATS[self.wikiformat], data, self.commit)
+ self.text=self.page.formatted_data
+
+ end
+
+ def page
+ self.get_page(wikiname) if @page.nil?
+ @page
+ end
+
+ def wiki
+ @wiki
+ end
+ def reload_page
+ self.get_page(self.wikiname)
+ end
+ protected
+
+
+ def self.is_file_availaible(name)
+ wiki = Gollum::Wiki.new("../wiki.git", :base_path => "/wiki")
+ wiki.page(name)
+ end
+
+ def load_wiki
+ @wiki = Gollum::Wiki.new("../wiki.git", :base_path => "/wiki")
+ end
+
+ def get_page(name)
+ @page= @wiki.page(name)
+ @page=self.wiki.write_page(self.wikiname, Wiki::WIKIFORMATS[self.wikiformat]," ",self.commit) if @page.nil?
+ @page
+ end
+ def commit
+ {message: "RailsUpdate", name:"SomeUser", email: "ttt@t"}
+ end
+
+ def self.commit
+ {message: "RailsUpdate", name:"SomeUser", email: "ttt@t"}
+ end
+end
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb
index cba26e4..c7d10a4 100644
--- a/app/uploaders/attachment_uploader.rb
+++ b/app/uploaders/attachment_uploader.rb
@@ -4,8 +4,13 @@ class AttachmentUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
include CarrierWave::RMagick
+# include CarrierWave::Uploader::Processing
+
# include CarrierWave::RMagick
# include CarrierWave::MiniMagick
+def root
+ Rails.root.join 'public/'
+end
# Choose what kind of storage to use for this uploader:
storage :file
@@ -16,12 +21,44 @@ class AttachmentUploader < CarrierWave::Uploader::Base
def store_dir
"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end
+ def cover
+ manipulate! do |frame, index|
+ index== 0 ? frame.convert(:jpg) : nil
+
+ end
+ end
+ version :thumb ,:if=>:image? do
+ process :resize_to_fill => [64, 64]
+ process :convert => :jpg
- version :thumb do
- process :resize_to_fill => [64, 64]
- end
+ def full_filename(for_file)
+ super.chomp(File.extname(super)) + '.jpg'
+ end
+ end
- # Provide a default URL as a default if there hasn't been a file uploaded:
+ version :cover , :if=>:image? do
+ process :cover
+ process :resize_to_fit => [64,64]
+ process :convert => :jpg
+ def full_filename(for_file)
+ super.chomp(File.extname(super)) + '.jpg'
+ end
+ end
+ version :thumb_small , :if=>:image? do
+ process :resize_to_fill => [32, 32]
+ end
+ version :thumb_big , :if=>:image? do
+
+ process :resize_to_fill => [200, 200]
+ process :convert => :jpg
+ def full_filename(for_file)
+ super.chomp(File.extname(super)) + '.jpg'
+ end
+
+ end
+ version :resized, :if=>:image? do
+ process :resize_to_fit => [1024,1024]
+ end
# def default_url
# # For Rails 3.1+ asset pipeline compatibility:
# # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
@@ -52,5 +89,8 @@ class AttachmentUploader < CarrierWave::Uploader::Base
# def filename
# "something.jpg" if original_filename
# end
-
+protected
+ def image?(file)
+ %w(jpg png jpeg).include?(File.extname(full_filename(file)))
+ end
end
diff --git a/app/uploaders/beispieldatei_uploader.rb b/app/uploaders/beispieldatei_uploader.rb
index 86da81e..947f813 100644
--- a/app/uploaders/beispieldatei_uploader.rb
+++ b/app/uploaders/beispieldatei_uploader.rb
@@ -12,6 +12,10 @@ class BeispieldateiUploader < CarrierWave::Uploader::Base
# Override the directory where uploaded files will be stored.
# This is a sensible default for uploaders that are meant to be mounted:
+def root
+ Rails.root.join 'public/'
+end
+
def store_dir
"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end
diff --git a/app/views/attachments/_attachment.html.erb b/app/views/attachments/_attachment.html.erb
index 1fc66d3..0045f70 100644
--- a/app/views/attachments/_attachment.html.erb
+++ b/app/views/attachments/_attachment.html.erb
@@ -1,9 +1,9 @@
<% data_ext = attachment.datei.file.extension.downcase %>
- <%= attachment.name %>
+
<% if (!["jpg","png","jpeg"].find_index(data_ext).nil?) %>
<%= image_tag attachment.datei.thumb.url %>
<% else %>
<%= image_tag "pdf-logo.jpg" %>
<% end %>
-
+ <%= attachment.name %>
diff --git a/app/views/attachments/_form_bulk.html.erb b/app/views/attachments/_form_bulk.html.erb
new file mode 100644
index 0000000..b8c8616
--- /dev/null
+++ b/app/views/attachments/_form_bulk.html.erb
@@ -0,0 +1,143 @@
+
+
+ <%= semantic_form_for [@thema,@attachment], :remote=>true, :html => { :multipart => true, :id => "fileupload" } do |f| %>
+
+
+
+
+
+
+
+ Add files...
+ <%= f.file_field :datei, :multiple=>true %>
+ <% f.input :thema %>
+
+
+ Start upload
+
+
+ Cancel upload
+
+
+ Delete
+
+
+
+
+
+
+
+
+
+
+ <% end %>
+
+
-
-
<%=link_to beispiel.name, beispiel.beispieldatei.url%> <%= link_to "edit", edit_beispiel_path(beispiel)%>
-<%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB
+
+
+<%=link_to ffi1_icon("note20")+" " + beispiel.name, beispiel.beispieldatei.url, title: beispiel.desc %>
+
+<%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB <%=
+if can?(:like, beispiel)
+link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) : beispiel.get_likes.size.to_s)
+else
+"liked by " + beispiel.get_likes.size.to_s
+end
+%>
+
+<%=
+if can?(:dislike, beispiel)
+link_to ffi1_icon("dislike")+" dislike" + "("+beispiel.get_dislikes.size.to_s+")", dislike_beispiel_path(beispiel),title:"disliked by " + ((current_user.disliked?(beispiel)) ? ("you and " + ((beispiel.get_dislikes.size - 1).to_s + " others")) : beispiel.get_dislikes.size.to_s)
+else
+"disliked by " + beispiel.get_dislikes.size.to_s
+end
+
+%>
+
+<%= link_to ff_icon("icon-pencil")+" edit", edit_beispiel_path(beispiel) if can? :edit, beispiel%>
+<%= link_to ff_icon("icon-remove")+" delete", beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %>
+
-
diff --git a/app/views/beispiele/_form.html.erb b/app/views/beispiele/_form.html.erb
index 8fd09ce..fd92b3f 100755
--- a/app/views/beispiele/_form.html.erb
+++ b/app/views/beispiele/_form.html.erb
@@ -14,6 +14,8 @@
+ <%= f.input :name %>
+
<%= f.input :desc %>
@@ -21,7 +23,7 @@
- <%= f.input :lva, :as=>:radio, :collection => Lva.all%>
+ <%= f.input :lva, :as=>:radio, :collection => Lva.all %>
diff --git a/app/views/calentries/_nested_fields.html.erb b/app/views/calentries/_nested_fields.html.erb
index e4fc987..6f1f97d 100644
--- a/app/views/calentries/_nested_fields.html.erb
+++ b/app/views/calentries/_nested_fields.html.erb
@@ -4,7 +4,7 @@
- <%= f.input :start, :as => :datepicker %>
+ <%= f.input :start, :as => :datetimepicker %>
<%= f.input :dauer , :as => :string, :append=>"h" %>
<% f.input :typ %>
<%= f.check_box :_destroy %> <%= I18n.t 'common.delete' %>
diff --git a/app/views/fetprofiles/_form.html.erb b/app/views/fetprofiles/_form.html.erb
index 8143c08..b179549 100644
--- a/app/views/fetprofiles/_form.html.erb
+++ b/app/views/fetprofiles/_form.html.erb
@@ -11,11 +11,11 @@
- <%= f.input :desc %>
+ <%= f.input :desc , input_html: {style: "width:100%"}%>
-
<%= f.input :active %>
+
<%= f.input :active %> <%= f.input :geschlecht,:as=>:select, :collection=>Fetprofile::GESCHLECHT.invert %>
<%= image_tag(@fetprofile.picture.thumb.url) unless @fetprofile.picture.nil? %>
<%= f.file_field :picture %>
@@ -28,28 +28,48 @@
<%= f.input :fetmailalias %>
-<% @memberships.each do |m| %>
+
+
- <%= f.semantic_fields_for :memberships, m do |membership| %>
-
-
-
-
-
<%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%>
-
<%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %>
-
<%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %>
-
<%= membership.input :gremium, :label=>false %>
+<%= I18n.t("fetprofile.adresse") %>:
+
+<%=f.input :street %>
+
+<%=f.input :plz, input_html: {style: "width:5em"} %>
+<%=f.input :city, input_html: {style: "width:5em"} %>
+<%=f.input :telnr %>
+<%=f.input :hdynr %>
-
<%= membership.check_box :_destroy %> <%= I18n.t 'common.delete' %>
-
-
- <% end %>
- <% end %> <% end %>
+
+<%= I18n.t("fetprofile.geburtstag") %>:
+
+<%=f.input :birth_day, input_html: {style: "width:3em"}%>
+<%=f.input :birth_month, input_html: {style: "width:3em"} %>
+<%=f.input :birth_year, input_html: {style: "width:5em"} %>
+
+
+
+
+<%=f.input :instant %>
+<%=f.input :skype %>
+
+
+
+
+
+<% @memberships.each do |m| %>
+<%= render partial:"membership_fields", object: m , locals: {:f=>f} %>
+<% end %>
+
+
+<% end %>
<%= f.actions do %>
- <%= f.action :submit, :as => :input %>
+ <%= f.action :submit, :as => :button, :label=>I18n.t("common.save") %>
+ <%= f.action :submit, :as => :button, :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
+ <%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
<% end %>
diff --git a/app/views/fetprofiles/_interninfo.html.erb b/app/views/fetprofiles/_interninfo.html.erb
new file mode 100644
index 0000000..bd5fc1f
--- /dev/null
+++ b/app/views/fetprofiles/_interninfo.html.erb
@@ -0,0 +1,16 @@
+
+Geburtstag <%= %>
+
+
+ Adresse:
+ <%= interninfo.plz %>
+ <%= interninfo.city %>,
+ <%= interninfo.street %>
+
+
+ <%= raw("Telefon: ")+ interninfo.telnr + "Handy: ") +interninfo.hdynr unless interninfo.hdynr.nil? || interninfo.hdynr.empty? %>Skype: ") +interninfo.skype unless interninfo.skype.nil? || interninfo.skype.empty? %>Instant Messaging: ") +interninfo.instant unless interninfo.instant.nil? || interninfo.instant.empty? %>
diff --git a/app/views/fetprofiles/_internrow.html.erb b/app/views/fetprofiles/_internrow.html.erb
new file mode 100644
index 0000000..63fbb75
--- /dev/null
+++ b/app/views/fetprofiles/_internrow.html.erb
@@ -0,0 +1,12 @@
+
+ <%= link_to internrow.name, internrow %>
+
+ <%= internrow.adress %>
+
+ <%= raw("Telefon: ")+ internrow.telnr + "
+<%= internrow.fetmail %>
+
diff --git a/app/views/fetprofiles/_membership_fields.html.erb b/app/views/fetprofiles/_membership_fields.html.erb
new file mode 100644
index 0000000..957347e
--- /dev/null
+++ b/app/views/fetprofiles/_membership_fields.html.erb
@@ -0,0 +1,13 @@
+<%= f.semantic_fields_for :memberships, membership_fields do |membership| %>
+
+<%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false , :input_html => { :style => "width:6em"} %>
+
+ <%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" , :input_html => { :style => "width:6em"}%>
+
+<%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false , :input_html => { :style => "width:12em" }%>
+
+<%= membership.input :gremium, :label=>false %>
+
+<%= membership.check_box :_destroy %> <%= I18n.t 'common.delete' %>
+
+<% end %>
diff --git a/app/views/fetprofiles/edit.html.erb b/app/views/fetprofiles/edit.html.erb
index c2d79e3..f63468c 100644
--- a/app/views/fetprofiles/edit.html.erb
+++ b/app/views/fetprofiles/edit.html.erb
@@ -1,6 +1,7 @@
-
Editing fetprofile
+
<%= I18n.t("fetprofile.edit")%>
<%= render 'form' %>
-<%= link_to 'Show', @fetprofile %> |
-<%= link_to 'Back', fetprofiles_path %>
+
+
+
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index d80a255..21c64a6 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -6,9 +6,15 @@
<%= I18n.t 'profile.active_members' if params[:filter].nil? || params[:filter]== "active"
%>
+
+
+ <%= render 'layouts/pretty_toolbar' %>
+
+ <% link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
+
+
-
<% @fetprofiles.each do |fetprofile| %>
@@ -39,11 +45,7 @@
-
-
- <%= link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
-
-
+
+<% @fetprofiles.each do |item| %>
+<%= render partial: "internrow", object: item %>
+<% end %>
+
diff --git a/app/views/fetprofiles/new.html.erb b/app/views/fetprofiles/new.html.erb
index 0499665..08d39f3 100644
--- a/app/views/fetprofiles/new.html.erb
+++ b/app/views/fetprofiles/new.html.erb
@@ -2,4 +2,4 @@
<%= render 'form' %>
-<%= link_to I18n.t('common.back'), fetprofiles_path %>
+
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index ded2659..866cb66 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -13,7 +13,7 @@
<%= @fetprofile.desc %>
-
+ <%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>
<% @memberships.each do |m| %>
diff --git a/app/views/fragen/_form.html.erb b/app/views/fragen/_form.html.erb
index ce19bc5..07f8b7d 100644
--- a/app/views/fragen/_form.html.erb
+++ b/app/views/fragen/_form.html.erb
@@ -10,3 +10,5 @@
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
+<%= tinymce :theme => "simple", :language => "de", :plugins => ["wordcount", "paste"] %>
+ <% tinymce :compact %>
diff --git a/app/views/fragen/_frage.html.erb b/app/views/fragen/_frage.html.erb
index 1197db7..d7357a8 100644
--- a/app/views/fragen/_frage.html.erb
+++ b/app/views/fragen/_frage.html.erb
@@ -1,8 +1,8 @@
- <%= frage.title %> <%= frage.title %>?
diff --git a/app/views/fragen/_rform.html.erb b/app/views/fragen/_rform.html.erb
index a3780d1..b772066 100644
--- a/app/views/fragen/_rform.html.erb
+++ b/app/views/fragen/_rform.html.erb
@@ -10,3 +10,4 @@
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
+ <%= tinymce :menubar=>false %>
diff --git a/app/views/galleries/index.html.erb b/app/views/galleries/index.html.erb
index 258fd23..105c0a4 100644
--- a/app/views/galleries/index.html.erb
+++ b/app/views/galleries/index.html.erb
@@ -1,4 +1,5 @@
<%= I18n.t('fotos.galleries')%>
+<%= render :partial => 'layouts/pretty_toolbar' %>
<% @galleries.each_slice(2) do |row| %>
<% row.each do |gallery| %>
@@ -37,4 +38,3 @@
<% end %>
-<%= render :partial => 'layouts/pretty_toolbar' %>
diff --git a/app/views/gremien/_form.html.erb b/app/views/gremien/_form.html.erb
index d253575..7873320 100644
--- a/app/views/gremien/_form.html.erb
+++ b/app/views/gremien/_form.html.erb
@@ -5,41 +5,41 @@
<%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %>
<%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %>
<%= f.input :thema, :as=> :select, :collection => Thema.all %>
-
-
- <% f.inputs :for => :memberships, :objects=>@memberships do |membership,i| %>
-
-
-
<%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%>
-
<%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %>
-
<%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %>
-
<%= membership.input :fetprofile, :as=>:select, :label=>false %>
-
-
-
- <% end %>
-
-
-<% @memberships.each do |m| %>
-
+ <% @memberships.each do |m| %>
<%= f.semantic_fields_for :memberships, m do |memberships_attributes| %>
-
<%= memberships_attributes.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%>
-
<%= memberships_attributes.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %>
-
<%= memberships_attributes.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %>
-
<%= memberships_attributes.input :fetprofile, :as=>:select, :label=>false %>
-
-
+
+
+ <%= memberships_attributes.input :start, :as=>:datepicker, :prepend=>"von",:label=>false , :input_html => { :style => "width:6em" } ,:value=>Proc.new { |c| I18n.l(c) }%>
+
+
+ <%= memberships_attributes.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" , :input_html => { :style => "width:6em"},:value_method=>Proc.new { |c| I18n.l(c) }%>
+
+
+ <%= memberships_attributes.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false, :input_html => { :style => "width:12em" } %>
+
+ <%= memberships_attributes.input :fetprofile, :as=>:select, :label=>false %>
+
+
+ <% end %>
+ <% end %>
<% end %>
-<% end %>
-
- <% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
+ <%= f.action :submit, :as => :button, :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
+ <%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
+
<% end %>
<% end %>
<%= tinymce %>
+
+
+
+
+
+
diff --git a/app/views/gremien/verwalten.html.erb b/app/views/gremien/verwalten.html.erb
index 38a339e..62f3cc1 100644
--- a/app/views/gremien/verwalten.html.erb
+++ b/app/views/gremien/verwalten.html.erb
@@ -1,13 +1,13 @@
Listing gremien
+<%= render 'layouts/pretty_toolbar' %>
<% @gremien.each do |gremium| %>
- <%= gremium.typ %>
+ <%= Gremium::TYPEN[gremium.typ.to_i] %>
<%= gremium.name %>
- <%= gremium.desc %>
@@ -38,7 +37,7 @@
-<%= render 'layouts/pretty_toolbar' %>
+
diff --git a/app/views/home/_beispiele.html.erb b/app/views/home/_beispiele.html.erb
index b6f178b..5b73511 100644
--- a/app/views/home/_beispiele.html.erb
+++ b/app/views/home/_beispiele.html.erb
@@ -1,21 +1,16 @@
-
-
Neueste Beispiele in unserer Sammlung
+ <%= I18n.t("home.newexamples") %>
<%= link_to I18n.t("beispiel.add"), new_beispiel_path, :class=>"btn"%>
-
-
-
-
<% @beispiele.each do |b| %>
- <%= link_to b, {:class=> :linkbox} do %>
+ <%= link_to b.lva, {:class=> :linkbox} do %>
<%=b.name%> (<%=b.lva.full_name%>)
diff --git a/app/views/home/_search_results.html.erb b/app/views/home/_search_results.html.erb
index b4153fb..9719807 100644
--- a/app/views/home/_search_results.html.erb
+++ b/app/views/home/_search_results.html.erb
@@ -27,12 +27,16 @@
Themen
<% end %>
-<% @themen.each do |thema| %>
+
+<% @themen.each do |thema| %>
+<% if can? :show, thema %>
<%= link_to thema.title,thema %>
<%= render :partial=>"themen/small", :object=>thema %>
-
<% end %>
+
+<% end %>
+
diff --git a/app/views/home/admin.html.erb b/app/views/home/admin.html.erb
new file mode 100644
index 0000000..55cc15d
--- /dev/null
+++ b/app/views/home/admin.html.erb
@@ -0,0 +1,12 @@
+
<%= link_to "Grant extra FB privileges", user_omniauth_authorize_path(:facebook,:params=>{scope:"manage_pages,publish_actions,email"}) %>
+
+
+<%= link_to "user", users_path %>
+
+
+<%= @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 %>
+
diff --git a/app/views/home/dev.html.erb b/app/views/home/dev.html.erb
deleted file mode 100755
index 1eef047..0000000
--- a/app/views/home/dev.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-
Entwicklungsprojekt
-<%= link_to "notimplemented", home_linksnotimplemented_path %>
-
Feature List: 2013-07-17
-
-Info zu Studien/Studienpläne
-Info zu LVAs
-Beispielsammlung
-Kalender
-Events
-Termine
-Fotos
-FET Mitarbeiter
-Personen Profile (TISS?)
-News
-Gremien - Mitgliedschaften
-Börse (JOBs) Sitzungsbeschluss:Derzeit Nein
-Lost&Found
-FAQ
-Informationen (ZB Auslandssemester, Anfänerinfo
-Impressum
-Linksammlung
-Fetzn
-FET Sitzungstops
-
-
Testfeatures
-
Neuigkeiten
-
Wichtige Punkte die noch entwickelt werden sind:
Verwaltung bestehender Nachrichten Facebook Interface
-
<%= link_to "Neuigkeiten", rubriken_path %>
-
-
Wiki
-
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 7b57ca4..d89b64c 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -5,7 +5,7 @@
<%= render n if can?(:show, n) %>
<% end %>
-
+
@@ -23,14 +23,11 @@
<%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %>
Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden
<%= link_to "Getting Started" , startdev_home_index_path %>
-
Das Kalender Feature wird überarbeitet, in Zukunft soll folgender Link nicht mehr funktionieren <%= link_to "Kalender", calendars_path %>
-
-
<%= link_to "Entwicklungsstatus" , dev_home_index_path %>
<%= render 'beispiele' %>
-Verschiedene Styles
+<%= I18n.t("home.selectstyle") %>
<%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %>
<%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %>
diff --git a/app/views/home/intern.html.erb b/app/views/home/intern.html.erb
index b419c02..4dbf69d 100644
--- a/app/views/home/intern.html.erb
+++ b/app/views/home/intern.html.erb
@@ -1,10 +1,34 @@
FET Intern NEU
-Neuigkeiten
-
- <% @neuigkeiten.each do |n| %>
- <%= render n if can?(:show, n) %>
- <% end %>
+
+
+
+
+
+ <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
+ <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+
+
+
+ <%= link_to "Users", users_path %>
+
+
+
Neuigkeiten
+
+ <% @neuigkeiten.each do |n| %>
+ <%= render n if can?(:show, n) %>
+ <% end %>
+
+
+
+
-
Kontakt
+
<%= I18n.t "kontakt.H1" %>
- <%= I18n.t "home.kontakt" %>
+ <%= I18n.t "kontakt.text" %>
-
Service
-
-
Impressum
-
Credits
+
<%= I18n.t "kontakt.service" %>
+ <%= raw(I18n.t( "kontakt.service_text")) %>
+
<%= I18n.t "kontakt.adresse" %>
+
<%= raw(I18n.t("kontakt.adresse_text")) %>
+
<%= raw(I18n.t ("kontakt.telefon_text")) %>
+
<%= I18n.t("common.actions")%>
<% toolbar_elements.each do |t| %>
@@ -14,10 +15,10 @@ Verwendung: Aufruf mit
<% else %>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a07ee93..22b340c 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,25 +3,17 @@
-
+
Fetsite
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
- <%= theme_stylesheet_link_tag "test", :media => "all" %>
+ <% theme_stylesheet_link_tag "test", :media => "all" %>
<% theme_stylesheet_link_tag "mod", :media=>"all" %>
-
-
-
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
-
@@ -29,10 +21,13 @@
-
+ <%= f.input :desc , :as=>:tinymce_text %>
+ <%= f.input :pruefungsinformation %>
+ <%= f.input :lernaufwand %>
+
+
diff --git a/app/views/lvas/_lva.html.erb b/app/views/lvas/_lva.html.erb
index a49bb55..16ff66f 100755
--- a/app/views/lvas/_lva.html.erb
+++ b/app/views/lvas/_lva.html.erb
@@ -1,6 +1,6 @@
<%= notice %>
-
<%=lva.typ.to_s + ' ' + lva.name %>
+
<%= lva.typ_n.to_s + ' ' + lva.name %>
Prüfungsinformation
<%= lva.pruefungsinformation.to_s.html_safe %>
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index d5bb9cb..60c311e 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -3,11 +3,14 @@
<%= notice %>
-
<%=@lva.typ.to_s + ' ' + @lva.name %>
-
+
<%= @lva.full_name %>
+
+ <%= link_to ffi1_icon("live2")+"ET-Forum",@lva.forumlink, class: :linkbox unless @lva.forumlink.nil? or @lva.forumlink.empty?%>
+
+
Prüfungsinformation
- <%= @lva.pruefungsinformation.html_safe %>
+ <%= @lva.pruefungsinformation.to_s.html_safe %>
Lernaufwand
@@ -19,10 +22,6 @@
<%= @lva.desc.to_s.html_safe %>
-
Beispiele
- <% @lva.beispiele.each do |b| %>
- <%= render b%>
- <% end %>
@@ -57,6 +56,17 @@
+
+
+
+
Beispiele
+ <%= link_to t("beispiel.zip") , beispiel_sammlung_lva_path(@lva), class: :linkbox %>
+ <% @lva.beispiele.each do |b| %>
+ <%= render b%>
+ <% end %>
+
+
<% unless @lva.nlinks.empty? %>
diff --git a/app/views/memberships/_form.html.erb b/app/views/memberships/_form.html.erb
deleted file mode 100644
index 252f116..0000000
--- a/app/views/memberships/_form.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= semantic_form_for [@membership.fetprofile,@membership] do |f| %>
- <%= f.inputs do %>
- <%= f.input :gremium, :as=>:radio %>
- <%= f.input :start %>
- <%= f.input :stop %>
- <%= f.input :typ ,:as=>:radio,:collection=>Membership::TYPEN.invert %>
- <% end %>
-
- <%= f.actions do %>
- <%= f.action :submit, :as => :input %>
- <% end %>
-<% end %>
diff --git a/app/views/memberships/_membership.html.erb b/app/views/memberships/_membership.html.erb
index f6b8679..ad5daef 100644
--- a/app/views/memberships/_membership.html.erb
+++ b/app/views/memberships/_membership.html.erb
@@ -1,6 +1,6 @@
-<%= membership.stop.nil? ? "seit " : "von " %>
+<%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %>
<%=membership.start.to_s %>
-<%= " bis "+membership.stop.to_s unless membership.stop.nil? %>
-<%= Membership::TYPEN[membership.typ.to_i] %>
+<%= " "+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 %>
diff --git a/app/views/memberships/edit.html.erb b/app/views/memberships/edit.html.erb
deleted file mode 100644
index 84851bd..0000000
--- a/app/views/memberships/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-
Editing membership
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @membership %> |
-<%= link_to 'Back', memberships_path %>
diff --git a/app/views/memberships/index.html.erb b/app/views/memberships/index.html.erb
deleted file mode 100644
index 2a5e5ff..0000000
--- a/app/views/memberships/index.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-
Listing memberships
-
-
-
- Fetprofile
- Gremium
- Start
- Stop
- Typ
-
-
-<% @memberships.each do |membership| %>
-
- <%= membership.fetprofile_id %>
- <%= membership.gremium_id %>
- <%= membership.start %>
- <%= membership.stop %>
- <%= membership.typ %>
- <%= link_to 'Show', membership %>
- <%= link_to 'Edit', edit_membership_path(membership) %>
- <%= link_to 'Destroy', membership, method: :delete, data: { confirm: 'Are you sure?' } %>
-
-<% end %>
-
-
-
-
-<%= link_to 'New Membership', new_membership_path %>
diff --git a/app/views/memberships/new.html.erb b/app/views/memberships/new.html.erb
deleted file mode 100644
index 2e8e5ec..0000000
--- a/app/views/memberships/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-
New membership
-
-<%= render 'form' %>
-
-<%= link_to 'Back', @membership.fetprofile %>
diff --git a/app/views/memberships/show.html.erb b/app/views/memberships/show.html.erb
deleted file mode 100644
index e64ca53..0000000
--- a/app/views/memberships/show.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-
<%= notice %>
-
-
- Fetprofile:
- <%= @membership.fetprofile_id %>
-
-
-
- Gremium:
- <%= @membership.gremium_id %>
-
-
-
- Start:
- <%= @membership.start %>
-
-
-
- Stop:
- <%= @membership.stop %>
-
-
-
- Typ:
- <%= @membership.typ %>
-
-
-
-<%= link_to 'Edit', edit_membership_path(@membership) %> |
-<%= link_to 'Back', memberships_path %>
diff --git a/app/views/modulgruppen/index.html.erb b/app/views/modulgruppen/index.html.erb
index fb37c87..9e735dd 100755
--- a/app/views/modulgruppen/index.html.erb
+++ b/app/views/modulgruppen/index.html.erb
@@ -1,10 +1,8 @@
<%= I18n.t("modulgruppe.show.title")%>
-
-
<% @modulgruppen.sort_by{|n| n[:name]}.each do |modulgruppe| %>
<%= render modulgruppe%>
<% end %>
<% if !@studium.nil? %>
-<%= link_to 'New Modulgruppe', new_studium_modulgruppe_path(@studium) %>
+<%= link_to I18n.t("modulgruppe.new"), new_studium_modulgruppe_path(@studium) if can? :new, Modulgruppe %>
<% end%>
diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb
index b82f795..6065ba3 100644
--- a/app/views/neuigkeiten/_compact.html.erb
+++ b/app/views/neuigkeiten/_compact.html.erb
@@ -6,8 +6,8 @@
- <%= neuigkeit.rubrik.name %>
- <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %>
+ <%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %> <%= neuigkeit.rubrik.name %>
+ <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %>
<%= neuigkeit.title%>
diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb
index 480709e..e92ea7b 100755
--- a/app/views/neuigkeiten/_form.html.erb
+++ b/app/views/neuigkeiten/_form.html.erb
@@ -1,37 +1,40 @@
<%= tinymce_assets %>
-<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
+ <%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
<%= f.inputs do %>
-
-
- <%= f.input :title, :placeholder=> "Titel" %>
- <%= f.input :text, :as=> :tinymce_text %>
-
-
-
-
- <% f.input :datum, :as=> :datepicker %>
- <%= f.input :rubrik, :as=> :radio, :collection=>Rubrik.all %>
+
+
+ <%= f.input :title, :placeholder=> "Titel" %>
+ <%= f.input :text, :as=> :tinymce_text %>
+
+
+
+
+ <% f.input :datum, :as=> :datepicker %>
+ <%= f.input :rubrik, :as=> :radio, :collection=>Rubrik.all %>
+
+
+ <%= f.input :author, :as=> :select %>
+
-
- <%= f.input :author, :as=> :select %>
+
+
+ <%= f.input :picture, :as=> :file %>
+
-
-
-
- <%= f.input :picture, :as=> :file %>
-
-
-
-<%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
-<%= render 'calentries/nested_fields', :f => calentry %>
- <% end %>
-
+
+ <%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
+ <%= render 'calentries/nested_fields', :f => calentry %>
+ <% end %>
+
<% end %>
<%= f.actions do %>
- <%= f.action :submit, :as => :input %>
+ <%= f.action :submit, :as => :input %>
+ <% end %>
<% end %>
-<% end %>
-
+
<%= tinymce %>
diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb
index dd98a3a..9e17f73 100755
--- a/app/views/neuigkeiten/_neuigkeit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit.html.erb
@@ -1,4 +1,5 @@
-
-<%= link_to [neuigkeit.rubrik,neuigkeit], {class: :linkbox} do %>
+<% c =[:linkbox] %>
+<% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
+<%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
<%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %>
<% end %>
diff --git a/app/views/neuigkeiten/_nlink_list.html.erb b/app/views/neuigkeiten/_nlink_list.html.erb
index abbed76..d93927c 100644
--- a/app/views/neuigkeiten/_nlink_list.html.erb
+++ b/app/views/neuigkeiten/_nlink_list.html.erb
@@ -1,4 +1,4 @@
-
+
<%= link_to nlink_list.link do %>
<% p = nlink_list.link_type.downcase.pluralize+"/nlink" %>
diff --git a/app/views/neuigkeiten/_nlink_list_search.html.erb b/app/views/neuigkeiten/_nlink_list_search.html.erb
index b8521af..be5a2c9 100644
--- a/app/views/neuigkeiten/_nlink_list_search.html.erb
+++ b/app/views/neuigkeiten/_nlink_list_search.html.erb
@@ -1,7 +1,7 @@
<%= link_to nlink_list_search.title, nlink_list_search %>
-<%= link_to "add:"+nlink_list_search.title, create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s) %>
+ <%= link_to "add:"+nlink_list_search.title, create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s) %>
<% p = nlink_list_search.class.to_s.downcase.pluralize+"/nlink" %>
<%= render :partial=>p, :object=>nlink_list_search %>
diff --git a/app/views/neuigkeiten/edit.html.erb b/app/views/neuigkeiten/edit.html.erb
index d9bec4c..8c8b5a9 100755
--- a/app/views/neuigkeiten/edit.html.erb
+++ b/app/views/neuigkeiten/edit.html.erb
@@ -1,4 +1,4 @@
-
Editing neuigkeit
+
<%= I18n.t("neuigkeit.edit") %>
<%= %>
<%= render 'form' %>
<%= render 'layouts/pretty_toolbar' %>
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 2dcb846..10e32ef 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -3,11 +3,11 @@
<%= notice %>
- <%= @neuigkeit.rubrik.name %>
+ <%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %> <%= @neuigkeit.rubrik.name %>
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
- <%= @neuigkeit.author.text+ " am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
+ <%= @neuigkeit.author.text+ " "+ I18n.t("neuigkeit.am")+" " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
@@ -17,7 +17,6 @@
<%= @neuigkeit.title%>
-
<%= raw(@neuigkeit.text) %>
@@ -29,7 +28,7 @@
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
-Siehe auch:
+<%= I18n.t("neuigkeit.sieheauch") %>
<%= render partial: "nlink_list", collection: @neuigkeit.nlinks %>
@@ -38,9 +37,9 @@ Siehe auch:
<%= render partial: "nlink_list_search", collection: @nlink_search %>
-
+<% if can? :find_link, @neuigkeit %>
<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} do |f| %>
<%= f.input :query, :input_html => { :name => 'query' },:label=>false %>
<% end %>
-
+<% end %>
diff --git a/app/views/news_mailer/neuigkeit_mail.html.erb b/app/views/news_mailer/neuigkeit_mail.html.erb
new file mode 100644
index 0000000..8706934
--- /dev/null
+++ b/app/views/news_mailer/neuigkeit_mail.html.erb
@@ -0,0 +1,4 @@
+
+ <%= @neuigkeit.title%>
+
+ <%= raw(@neuigkeit.text) %>
diff --git a/app/views/rubriken/_form.html.erb b/app/views/rubriken/_form.html.erb
index ab6d620..4221474 100755
--- a/app/views/rubriken/_form.html.erb
+++ b/app/views/rubriken/_form.html.erb
@@ -3,8 +3,10 @@
<%= f.input :name %>
<%= f.input :desc %>
<%= f.input :prio %>
+ <%= f.input :color ,:as=>:radio,:collection=>{raw('
color1 ')=>1, raw('
color2 ')=>2, raw('
color3 ')=>3, raw('
color4 ')=>4, raw('
color5 ')=>5} %>
<%= f.input :public %>
-
+ <%= f.input :icon , :input_html=>{:id=>"iconfield"}%>
+
<% end %>
@@ -12,3 +14,13 @@
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
+
+
+
+ <% ffi1_list.each do |i| %>
+
<%=ffi1_icon(i)%>
+
+<% end %>
diff --git a/app/views/rubriken/_tabs.html.erb b/app/views/rubriken/_tabs.html.erb
index 4478b08..f6320a5 100644
--- a/app/views/rubriken/_tabs.html.erb
+++ b/app/views/rubriken/_tabs.html.erb
@@ -14,7 +14,7 @@
<% else %>
<% end %>
-<%= link_to "Verwaltung", verwalten_rubriken_path %>
+<%= link_to I18n.t("rubrik.management"), verwalten_rubriken_path if can? :verwalten, Rubrik %>
<% end %>
diff --git a/app/views/semesters/_semester.html.erb b/app/views/semesters/_semester.html.erb
new file mode 100644
index 0000000..26de7b9
--- /dev/null
+++ b/app/views/semesters/_semester.html.erb
@@ -0,0 +1,17 @@
+
+
+
+
+
<%= semester.name %>
+
+
+
+
+
+ <% semester.lvas.each do |lva| %>
+
+ <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
+
+ <% end %>
+
+
diff --git a/app/views/studien/_semesteransicht.html.erb b/app/views/studien/_semesteransicht.html.erb
index 416e667..37a9d1b 100644
--- a/app/views/studien/_semesteransicht.html.erb
+++ b/app/views/studien/_semesteransicht.html.erb
@@ -1,34 +1,19 @@
+<% if params[:info].true? %>
+<%= raw(@studium.desc) %>
+<% else %>
+<%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
+<% end %>
+
- <% if params[:info].true? %>
- <%= raw(@studium.desc) %>
- <% else %>
- <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
- <% end %>
-
- <% @studium.semester.each do |sem| %>
-
-
-
-
-
-
-
<%= sem.name %>
-
-
<%= link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>
-
-
-
- <% sem.lvas.each do |lva| %>
-
- <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
-
- <% end %>
-
-
-
+ <% @studium.semester.each_slice(2) do |row| %>
+
+ <% row.each do |sem| %>
+
+ <%= render sem %>
<% end %>
-
- <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+
+ <% end %>
+
diff --git a/app/views/studien/_tabs.html.erb b/app/views/studien/_tabs.html.erb
index 358baa7..b35a622 100644
--- a/app/views/studien/_tabs.html.erb
+++ b/app/views/studien/_tabs.html.erb
@@ -20,6 +20,6 @@
<% else %>
<% end %>
-<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path %>
+<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path if can? :verwalten, Studium %>
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
deleted file mode 100644
index 5ea2bde..0000000
--- a/app/views/studien/semesteransicht.html.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- <%= render 'studien/tabs' %>
-
-
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
-
-
-
- <%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
- <%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>
-
-
-
-
- <% if params[:info].true? %>
- <%= raw(@studium.desc) %>
- <% else %>
- <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
- <% end %>
-
- <% @studium.semester.each do |sem| %>
-
-
-
-
-
-
-
-
<%= sem.name %>
-
-
<%= link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>
-
- <% sem.lvas.each do |lva| %>
-
-
-
- <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
-
-
-
- <% end %>
-
-
-
-
-
- <% end %>
-
- <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
-
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 5ec47b1..01dcdcd 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -2,30 +2,30 @@
<%= notice %>
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
-
+
+
<%= link_to I18n.t("studien.ansicht.semester"), studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
<%= link_to I18n.t("studien.ansicht.modulgruppe"), studium_path(@studium, :ansicht=>"modulgruppenansicht"), :class=>"btn" unless params[:ansicht]=='modulgruppenansicht' %>
<%= link_to I18n.t("studien.ansicht.info"), studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" unless params[:ansicht]=='infoansicht' %>
-
+
+
<% if params[:ansicht]=='modulgruppenansicht' %>
<%= render partial: 'modulgruppenansicht' %>
<% else if params[:ansicht]=='infoansicht' %>
- <%= render partial: 'infoansicht' %>
+ <%= render partial: 'infoansicht' %>
<% else if params[:ansicht]== 'qualifikationsprofil' %>
-
Qualifikationsprofil
-
-<%= raw(@studium.qualifikation) %>
-
- <% else %>
- <%= render partial: 'semesteransicht' %>
-
+
Qualifikationsprofil
+
+ <%= raw(@studium.qualifikation) %>
+
+ <% else %>
+ <%= render partial: 'semesteransicht' %>
+ <% end %>
+ <% end %> <% end %>
-
-
- <% end %> <% end %> <% end %>
-
- <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+ <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+
<%= render 'layouts/pretty_toolbar' %>
diff --git a/app/views/themen/_attachment_list.html.erb b/app/views/themen/_attachment_list.html.erb
index 7b9c0cf..a210446 100644
--- a/app/views/themen/_attachment_list.html.erb
+++ b/app/views/themen/_attachment_list.html.erb
@@ -1,12 +1,18 @@
-
+
<% attachment_list.each do |a| %>
+ <%= link_to a.datei.url do %>
<%= render a %>
+<% end %>
+<% if editor %>
<%= link_to "Edit", edit_thema_attachment_path(a.thema,a) %>
+<%= link_to "Delete", thema_attachment_path(a.thema,a), method: "DELETE", confirm: "Sure?" %>
+
+<% end %>
<% end %>
diff --git a/app/views/themen/_attachment_verwalten.html.erb b/app/views/themen/_attachment_verwalten.html.erb
new file mode 100644
index 0000000..8fb67c3
--- /dev/null
+++ b/app/views/themen/_attachment_verwalten.html.erb
@@ -0,0 +1,3 @@
+
+<%= render :partial=>"attachments/form_bulk" %>
+<%= render partial: "themen/attachment_list", object:@thema.attachments ,locals: {:editor => true}%>
diff --git a/app/views/themen/_form.html.erb b/app/views/themen/_form.html.erb
index 08e8b59..4995656 100644
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -1,33 +1,68 @@
<%= tinymce_assets %>
+
-
-
-<%= semantic_form_for @thema, :remote=>true do |f| %>
+ <%= semantic_form_for @thema, :remote=>remote do |f| %>
<%= f.inputs do %>
-
-
- <%= f.input :title %>
-
-
- <%= f.input :themengruppe %>
-
-
-
- <%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %>
-
-
+
+
+ <%= f.input :title %>
+
+
+ <%= f.input :themengruppe %>
+
+
+
+
+ <%= f.input :isdraft %>
+
+
+ <%= f.input :hidelink, :as=>:boolean %>
+
+
+ <%= f.input :hideattachment %>
+
+
+
+
+
+
+
+ <%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %>
+
+
+
+
+
+
+<% unless I18n.locale == :de %>
+ <% I18n.with_locale(:de) do %>
+ <%= raw(@thema.text) %>
+ <% end %>
+<% end %>
+
+
+
+
+
+
+ <%= f.actions do %>
+ <%= f.action :submit, :as => :button, :label=> I18n.t("thema.save" ) %>
+ <%= f.action :submit, :as => :button, :label=> I18n.t("thema.savecont"), :button_html=>{:value=>"continue"} %>
+ <%= f.action :cancel, :as => :link %>
+ <% end %>
+
+
+
+ <% end %>
+ <% end %>
+ <%= tinymce %>
-<%= f.actions do %>
-<%= f.action :submit, :as => :button %>
-
-<%= f.action :cancel, :as => :link %>
-<% end %>
-<% end %><% end %>
- <%= tinymce %>
+<%= tinymce_icon_choice %>
Attachments:
<%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>
+
diff --git a/app/views/themen/_fragen.html.erb b/app/views/themen/_fragen.html.erb
index 727a14f..ea30282 100644
--- a/app/views/themen/_fragen.html.erb
+++ b/app/views/themen/_fragen.html.erb
@@ -6,5 +6,5 @@
<%= render :partial=>'fragen/rform' %>
-<% @frage_elements = [{:icon=>:plus, :hicon=>'icon-plus', :text=>I18n.t('frage.add'), :path=>new_frage_path}] %>
-<%= render :partial=>'layouts/pretty_toolbar', :object=>@frage_elements %>
+<% # @frage_elements = [{:icon=>:plus, :hicon=>'icon-plus', :text=>I18n.t('frage.add'), :path=>new_frage_path}] %>
+<% # render :partial=>'layouts/pretty_toolbar', :object=>@frage_elements %>
diff --git a/app/views/themen/_select.html.erb b/app/views/themen/_select.html.erb
index 2ddb1f9..a693ec0 100644
--- a/app/views/themen/_select.html.erb
+++ b/app/views/themen/_select.html.erb
@@ -23,10 +23,7 @@
-
-<%= render :partial=>'layouts/pretty_toolbar', :object=>@att_elements %>
-<% end %>
+
+
+
- <%= small.title %>
-
+
+ <%= small.title %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %>
+
+<% if small.is_outdated? %>
+ <%= I18n.t("thema.outdated") %>
+<% end %>
+<% if small.isdraft %>
+<%= I18n.t("thema.isdraft") %>
+
+<% end %>
<%= raw(small.text) %>
FAQs: ") unless small.fragen.empty? %>
+<%= raw("FAQs: ") unless small.fragen.empty? %>
<%= frage.title %>
-
<%= thema.title %>
-<%= link_to thema_path(thema),:remote=>true do %> Show <% end %> <%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %> <%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %><%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %><%= thema.title %>
+
+<%= link_to thema_path(thema),:remote=>true do %> Show <% end %>
+<%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %>
+<%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %>
+<%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %>"+I18n.t('thema.show')+" ")+render(:partial=>"themen/attachment_list", :object=>@attachments) )%>");
\ No newline at end of file
+$("#themaview").html("<%= escape_javascript(raw(""+I18n.t('thema.show')+" ")+render(:partial=>"themen/attachment_verwalten") )%>");
\ No newline at end of file
diff --git a/app/views/themen/edit.html.erb b/app/views/themen/edit.html.erb
index de6c7a3..3518641 100644
--- a/app/views/themen/edit.html.erb
+++ b/app/views/themen/edit.html.erb
@@ -1,5 +1,5 @@
-
Editing thema
-<%= render 'form' %>
+<%= I18n.t("thema.edit")%>
+<%= render 'form', :locals=>{:remote=>false}, :remote=>false %>
<%= link_to 'Back', @thema %>
diff --git a/app/views/themen/edit.js.erb b/app/views/themen/edit.js.erb
index 30ca8ab..5c8ca30 100644
--- a/app/views/themen/edit.js.erb
+++ b/app/views/themen/edit.js.erb
@@ -1 +1,3 @@
-$("#themaview").html("<%= escape_javascript(raw(""+I18n.t('thema.edit')+" ")+render(:partial=>"themen/form") )%>");
+$("#themaview").html("<%= escape_javascript(raw(""+I18n.t('thema.edit')+" ")+render(:partial=>"themen/form", :locals=>{:remote=>true}) )%>");
+
+
diff --git a/app/views/themen/new.html.erb b/app/views/themen/new.html.erb
index d2d719c..a7d70ce 100644
--- a/app/views/themen/new.html.erb
+++ b/app/views/themen/new.html.erb
@@ -1,6 +1,6 @@
<%= I18n.t("thema.add") %>
-<%= render 'form' %>
+<%= render 'form', :remote=>false %>
<%= link_to 'Back', themen_path %>
diff --git a/app/views/themen/show.html.erb b/app/views/themen/show.html.erb
index aa8912a..534a436 100644
--- a/app/views/themen/show.html.erb
+++ b/app/views/themen/show.html.erb
@@ -5,5 +5,3 @@
<%= render :partial=>'layouts/pretty_toolbar' %>
-<%= link_to new_thema_attachment_path(@thema) ,:remote=>true do %> new Attachment <% end %>
-<%= render :partial => "themen/select", :object => @thema, :locals=>{:editor => :false} %>
diff --git a/app/views/themen/update.js.erb b/app/views/themen/update.js.erb
index 82e2ffb..e65de53 100644
--- a/app/views/themen/update.js.erb
+++ b/app/views/themen/update.js.erb
@@ -1,4 +1,4 @@
-$("#themaview").html("<%= escape_javascript(raw("Bearbeiten ")+render(:partial=>"themen/small", :object=>@thema) )%>");
+$("#themaview").html("<%= escape_javascript(raw(""+I18n.t("thema.edit")+" ")+render(:partial=>"themen/small", :object=>@thema) )%>");
$("#themen").html("<%= escape_javascript(render(:partial=>"themen/verw_liste", :object=>@themen) )%>");
diff --git a/app/views/themen/verwalten.html.erb b/app/views/themen/verwalten.html.erb
index 70177ca..6b1a1bd 100644
--- a/app/views/themen/verwalten.html.erb
+++ b/app/views/themen/verwalten.html.erb
@@ -1,6 +1,9 @@
<%= notice %>
-
<%= @thema.title %>
+
+
+
+
<%= raw(@thema.text) %>
@@ -11,16 +14,22 @@
-->
<%= render :partial=>'layouts/pretty_toolbar' %>
+
<%= I18n.t('attachment.title')%>:
+
+
+<%= render partial: "attachment_verwalten" %>
+<%= render :partial => "themen/select", :object => @thema, :locals=>{:editor => :false} %>
+
+
+
+
<%= render :partial=>'themen/fragen' %>
-
<%= I18n.t('attachment.title')%>:
-
-
-
-<%= link_to new_thema_attachment_path(@thema) ,:remote=>true do %> new Attachment <% end %>
-<%= render :partial => "themen/select", :object => @thema, :locals=>{:editor => :false} %>
<%= link_to I18n.t('common.back'), themengruppen_path, :class=>:btn %>
+
+
+
<%=ffi1_icon(i)%>
+
+<% end %>
diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb
index a565d37..7e99e23 100644
--- a/app/views/themengruppen/_themengruppe.html.erb
+++ b/app/views/themengruppen/_themengruppe.html.erb
@@ -1,13 +1,21 @@
-<%= link_to themengruppe,{:class=>'linkbox'} do %>
+<%= link_to themengruppe,{:class=>'linkbox color-1-dark'} do %>
-
@@ -26,7 +34,7 @@
- <% themengruppe.themen.order(:title).each do |t| %>
+ <% themengruppe.themen.where(" (NOT hidelink) and ( NOT isdraft) ").order(:priority).reverse.each do |t| %>
<%= render t %>
diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb
index d3a7ab0..4dc64ce 100644
--- a/app/views/themengruppen/faqs.html.erb
+++ b/app/views/themengruppen/faqs.html.erb
@@ -1,24 +1,25 @@
+<%= I18n.t("themengruppe.faqs") %>
- <% @themengruppen.each do |tg| %>
-
-
-
<%= tg.title%>
-
- <% tg.themen.order(:priority).reverse.each do |t| %>
- <%= t.title %>
- <% t.fragen.each do |f| %>
-
- <%= f.title %>
- <%= f.text %>
-
-
- <% end %>
-
-
-
- <% end %>
-
-
-
- <% end %>
+ <% @themengruppen.each do |tg| %>
+
+
+
<%= tg.title%>
+
+ <% tg.themen.order(:priority).reverse.each do |t| %>
+ <%= t.title %>
+ <% t.fragen.each do |f| %>
+
+ <%= f.title %>?
+ <%= raw(f.text) %>
+
+
+ <% end %>
+
+
+
+ <% end %>
+
+
+
+ <% end %>
-
<%= link_to "FAQS", faqs_themengruppen_path,class: :btn %>
-
-
- <% @themengruppen.each do |themengruppe| %>
-
-
-
-
- <%= render themengruppe %>
-
-
-
-
-
+ <%= render :partial=>'layouts/pretty_toolbar' %>
+
+
+ <%= link_to fa_icon("question")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
+
+
+
-
- <%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
- <%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
-
<%= @themengruppe.title %>
+
+<% if @themengruppe.public %>
+ <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %>
+<% else %>
+ <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %>
+<% end %>
+ <%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+
+
+ <%= render :partial=>'layouts/pretty_toolbar' %>
+
+
<% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %>
+
<%= @themengruppe.text %>
- <% @themengruppe.themen.each do |thema| %>
+ <% @themen.each do |thema| %>
<%= render :partial => 'themen/small', :object => thema %>
- tools:
- <%
- @small_elements2 = []
- @small_elements2 << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('common.verwalten'), :path=>verwalten_thema_path(thema)} if can? :edit, thema
-
- %>
- <%= render :partial=>'layouts/pretty_toolbar', :object=>@small_elements2 unless @small_elements2.empty? %>
<% unless thema.gremium.nil? %>
-
<%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
<% end %>
<% thema.nlinks.each do |l| %>
- <%= render l.neuigkeit %>
- <% end %>
- <% thema.nlinks.each do |l| %>
- <%= render l.neuigkeit %>
+
+ <%= render l.neuigkeit if can? :show, l.neuigkeit%>
+
<% end %>
+
<% end %>
- <%= render :partial=>'layouts/pretty_toolbar' %>
diff --git a/app/views/themengruppen/verwalten_all.html.erb b/app/views/themengruppen/verwalten_all.html.erb
new file mode 100644
index 0000000..8d40ec1
--- /dev/null
+++ b/app/views/themengruppen/verwalten_all.html.erb
@@ -0,0 +1,54 @@
+
+<%= render :partial=>'layouts/pretty_toolbar' %>
+
+
+
+
+<% @themengruppen.each do |themengruppe| %>
+<%= themengruppe.title %>-<%= themengruppe.priority %>
+<% end %>
+
+
+<% @themengruppen_intern.each do |themengruppe| %>
+<%= themengruppe.title %>-<%= themengruppe.priority %>
+<% end %>
+
+
+
+
+
+
diff --git a/app/views/themes/2003/themengruppen/verwalten_all.html.erb b/app/views/themes/2003/themengruppen/verwalten_all.html.erb
index 827bd69..6367fa7 100644
--- a/app/views/themes/2003/themengruppen/verwalten_all.html.erb
+++ b/app/views/themes/2003/themengruppen/verwalten_all.html.erb
@@ -1,4 +1,6 @@
+<%= render :partial=>'layouts/pretty_toolbar' %>
+
<% @themengruppen.each do |themengruppe| %>
<%= themengruppe.title %>-<%= themengruppe.priority %>
@@ -6,7 +8,6 @@