diff --git a/Gemfile b/Gemfile index cddc99c..325301b 100644 --- a/Gemfile +++ b/Gemfile @@ -65,3 +65,7 @@ gem "cancan" gem 'paperclip' ,'~>3.4.0' gem 'git' +gem 'haml' +gem 'RedCloth' +gem 'gollum' +gem 'awesome_nested_set' diff --git a/Gemfile.lock b/Gemfile.lock index 6b0832a..5ea29a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + RedCloth (4.2.7) actionmailer (3.2.9) actionpack (= 3.2.9) mail (~> 2.4.4) @@ -29,6 +30,8 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) + awesome_nested_set (2.1.6) + activerecord (>= 3.0.0) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-x86-mingw32) bootstrap-sass (2.2.2.0) @@ -48,6 +51,7 @@ GEM orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) + diff-lcs (1.2.1) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -57,10 +61,29 @@ GEM formtastic (~> 2.2) formtastic-bootstrap git (1.2.5) + github-markdown (0.5.3) + github-markup (0.7.5) globalize3 (0.3.0) activemodel (>= 3.0.0) activerecord (>= 3.0.0) paper_trail (~> 2) + gollum (2.4.11) + github-markdown (~> 0.5.3) + github-markup (>= 0.7.4, < 1.0.0) + grit (~> 2.5.0) + mustache (>= 0.99.4, < 1.0.0) + nokogiri (~> 1.5.5) + pygments.rb (~> 0.3.2) + sanitize (~> 2.0.3) + sinatra (~> 1.3.3) + stringex (~> 1.5.1) + useragent (~> 0.4.15) + grit (2.5.0) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3.6) + haml (4.0.0) + tilt hike (1.2.1) i18n (0.6.1) journey (1.0.4) @@ -75,6 +98,9 @@ GEM treetop (~> 1.4.8) mime-types (1.21) multi_json (1.5.1) + mustache (0.99.4) + nokogiri (1.5.6) + nokogiri (1.5.6-x86-mingw32) orm_adapter (0.4.0) paper_trail (2.7.0) activerecord (~> 3.0) @@ -86,9 +112,15 @@ GEM cocaine (~> 0.4.0) mime-types polyglot (0.3.3) + posix-spawn (0.3.6) + pygments.rb (0.3.7) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.1.0) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) + rack-protection (1.4.0) + rack rack-ssl (1.3.3) rack rack-test (0.6.2) @@ -113,11 +145,17 @@ GEM json (~> 1.4) ref (1.0.2) rolify (3.2.0) + sanitize (2.0.3) + nokogiri (>= 1.4.4, < 1.6) sass (3.2.5) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sinatra (1.3.5) + rack (~> 1.4) + rack-protection (~> 1.3) + tilt (~> 1.3, >= 1.3.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -125,6 +163,7 @@ GEM tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) sqlite3 (1.3.7-x86-mingw32) + stringex (1.5.1) therubyracer (0.11.3) libv8 (~> 3.11.8.12) ref @@ -139,14 +178,19 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) + useragent (0.4.16) warden (1.2.1) rack (>= 1.0) + yajl-ruby (1.1.0) + yajl-ruby (1.1.0-x86-mingw32) PLATFORMS ruby x86-mingw32 DEPENDENCIES + RedCloth + awesome_nested_set bootstrap-sass (~> 2.2.0) cancan coffee-rails (~> 3.2.1) @@ -156,6 +200,8 @@ DEPENDENCIES formtastic-bootstrap git globalize3 (~> 0.3.0) + gollum + haml jquery-rails paper_trail (>= 2.7.0) paperclip (~> 3.4.0) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index bcf42d0..71eebc4 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -24,8 +24,9 @@ body,html div.header {display: block; -background: url('/assets/fet_logo_3.png') rgb(205,204,226) no-repeat; +background: url('/assets/fet_logo_2.png') rgb(235,235,235) no-repeat; background-position:15px center; +border-bottom:1px solid black; height:60px; padding-left:160px; padding-top:0px; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bdc1724..f7ac5a2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,6 +13,6 @@ class ApplicationController < ActionController::Base end end def default_url_options - {locale: I18n.locale} + {locale: I18n.locale, host:"128.131.95.212"} end end diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 4a0fd2c..0086b2d 100644 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -12,8 +12,9 @@ class NeuigkeitenController < ApplicationController def new @neuigkeit = Neuigkeit.new - - end + @rubrik=Rubrik.find(params[:rubrik_id]) + @neuigkeit.rubrik=@rubrik + end def edit diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb index 1f906ed..8c9ed56 100644 --- a/app/controllers/rubriken_controller.rb +++ b/app/controllers/rubriken_controller.rb @@ -67,6 +67,9 @@ class RubrikenController < ApplicationController @rubrik = Rubrik.find(params[:id]) @moderatoren=User.with_role(:newsmoderator,@rubrik) end + def alle_verwalten + @rubriken =Rubrik.all + end # DELETE /rubriken/1 # DELETE /rubriken/1.json def destroy @@ -74,4 +77,6 @@ class RubrikenController < ApplicationController @rubrik.destroy redirect_to rubriken_url end + + end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2076fd0..658db5e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,6 @@ module ApplicationHelper def current_url(overwrite={}) - url_for :only_path => true, :params => params.merge(overwrite).except(:controller,:action) + url_for :params => params.merge(overwrite).except(:controller,:action) end def switch_locale_url(target_locale) current_url({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/" diff --git a/app/models/ability.rb b/app/models/ability.rb index db14a6f..154d8ce 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -39,7 +39,7 @@ class Ability # Rechteverwaltung fuer Neuigkeiten - can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik) +# can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik) end end diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 9922d26..ff307f7 100644 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -1,5 +1,5 @@ class Neuigkeit < ActiveRecord::Base - attr_accessible :datum, :text, :title + attr_accessible :datum, :text, :title, :rubrik_id belongs_to :author, :class_name =>'User' belongs_to :rubrik, :class_name =>'Rubrik' end diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb index 91e87f8..604e766 100644 --- a/app/views/layouts/menu.html.erb +++ b/app/views/layouts/menu.html.erb @@ -1,6 +1,6 @@ <%= t 'home.mtitle'%>