Wiki Erstentwurf,

gollum installiert und Aktiviert,
noch nicht fertig!

Neuigkeiten / Rubriken Verwaltung verbessert
+ Neue Neuigkeiten einfügen,
+ Liste der Neuigkeiten einer Kategorie
+ html für Neuigkeiten

Gemfile

@@ -65,3 +65,7 @@ gem "cancan"
 gem 'paperclip' ,'~>3.4.0'
 
 gem 'git'
+gem 'haml'
+gem 'RedCloth'
+gem 'gollum'
+gem 'awesome_nested_set'

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)

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;

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

app/controllers/neuigkeiten_controller.rb

@@ -12,7 +12,8 @@ class NeuigkeitenController < ApplicationController
 
   def new
     @neuigkeit = Neuigkeit.new
-
+    @rubrik=Rubrik.find(params[:rubrik_id])
+    @neuigkeit.rubrik=@rubrik
  end
 
 

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

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+"/"

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

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

app/views/layouts/menu.html.erb

@@ -1,6 +1,6 @@
 <%= t 'home.mtitle'%>
 <ul class="nav nav-pills nav-stacked">
-	<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_url %>
+	<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
 </li>
 <li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
 <li><%= link_to I18n.t(:info,:scope=>'home' ) %></li>

app/views/neuigkeiten/_form.html.erb

@@ -1,11 +1,14 @@
+<%= tinymce_assets %>
 <%= semantic_form_for @neuigkeit do |f| %>
   <%= f.inputs do %>
     <%= f.input :title, :placeholder=>"Titel" %>
-    <%= f.input :text %>
+    <%= f.input :text, :as=>:tinymce_text %>
     <%= f.input :datum %>
+    <%= f.input :rubrik, :as=>:radio, :colleciton=>Rubrik.all %>
   <% end %>
 
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+<%= tinymce %>

app/views/neuigkeiten/_neuigkeit.html.erb

@@ -1,2 +1,2 @@
 <h2><%=neuigkeit.title %></h2>
-<p><%= neuigkeit.text %></p>
+<p><%= raw(neuigkeit.text) %></p>

app/views/neuigkeiten/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', neuigkeiten_path %>
+<%= link_to 'Back', rubrik_path(@rubrik) %>

app/views/rubriken/show.html.erb

@@ -35,7 +35,7 @@
 <div class="row-fluid">
 <span class="span12">
 <%= link_to 'Verwalten', verwalten_rubrik_path(@rubrik) %> |
-
+<%= link_to '<i class="icon-plus-sign"></i>'.html_safe+"Neuer Artikel", new_rubrik_neuigkeit_path(@rubrik) %> 
 <%= link_to 'Back', rubriken_path %> | 
 <%= link_to 'Destroy', @rubrik, method: :delete, data: { confirm: 'Are you sure?' } %>
 </span></div>

app/views/rubriken/verwalten.html.erb

@@ -1,6 +1,7 @@
- <p id="notice"><%= notice %></p>
- 
 <h1><%= @rubrik.name %></h1>
+ <p id="notice"><%= notice %></p>
+<%= render :partial=>'admin_liste', :locals=>{:rubriken => [@rubrik]} %>
+ 
 <table class="table">
 <b>Moderatoren:</b><i>
 <% @moderatoren.each do |m|%>

config/environments/development.rb

@@ -15,7 +15,7 @@ Fetsite::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+config.action_mailer.default_url_options = { :host => 'localhost:4000' }
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 

config/initializers/formtastic.rb

@@ -7,7 +7,7 @@
 # Formtastic::FormBuilder.default_text_area_height = 5
 
 # Set the default text area width when input is a text. Default is nil.
-# Formtastic::FormBuilder.default_text_area_width = 50
+ Formtastic::FormBuilder.default_text_area_width = 50
 
 # Should all fields be considered "required" by default?
 # Defaults to true.

config/routes.rb

@@ -3,16 +3,13 @@ Fetsite::Application.routes.draw do
 
 
  	 resources :beispiele
-
-
 	devise_for :users
-
+	resources :home, :only=>[:index]
+	#get 'home',:controller=>home,:action=>:index,:as=>"home_index"
 	scope '(:locale)/admin' do
 	resources :users
 	get 'config',:controller=>:config,:action=>:index , :as => 'config'
 	get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
-
-
 	get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
 
 
@@ -20,9 +17,13 @@ end
 
 devise_for :users
 
-
+resources :pages, :except => [:index] do
+	member do
+	post 'preview'
+	end
+end
+get 'pages', :to =>'pages#show'
 scope '(:locale)' do
-    
     resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
     resources :modulgruppen,:only =>[:create,:index]
     resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do 
@@ -31,10 +32,12 @@ devise_for :users
     resources :semesters
     resources :moduls
     resources :lvas
-    
     resources :neuigkeiten
-    resources :rubriken
+    get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
 
+    resources :rubriken do
+    resources :neuigkeiten, :only=>[:new, :show]
+    end
     put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
     get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
     resources :home
@@ -91,6 +94,7 @@ devise_for :users
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
+
    root :to => 'home#index'
 
   # See how all your routes lay out with "rake routes"

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130214233723) do
+ActiveRecord::Schema.define(:version => 20130301000000) do
 
   create_table "beispiel_translations", :force => true do |t|
     t.string   "locale"
@@ -55,6 +55,7 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
     t.integer  "modul_id"
+    t.integer  "semester_id"
   end
 
   create_table "lvas_moduls", :id => false, :force => true do |t|
@@ -105,10 +106,9 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
   create_table "moduls", :force => true do |t|
     t.string   "name"
     t.text     "desc"
+    t.text     "depend"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-    t.text     "depend"
-    t.integer  "studium_id"
   end
 
   create_table "neuigkeiten", :force => true do |t|
@@ -120,6 +120,18 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "pages", :force => true do |t|
+    t.string   "name"
+    t.string   "url"
+    t.integer  "parent_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "pages", ["parent_id"], :name => "index_pages_on_parent_id"
+
   create_table "roles", :force => true do |t|
     t.string   "name"
     t.integer  "resource_id"
@@ -142,8 +154,8 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
   create_table "semesters", :force => true do |t|
     t.string   "name"
     t.integer  "nummer"
-    t.boolean  "ws"
+    t.integer  "studium_id"
-    t.boolean  "ss"
+    t.string   "ssws"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
@@ -151,6 +163,7 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
   create_table "studien", :force => true do |t|
     t.string   "zahl"
     t.string   "name"
+    t.text     "shortdesc"
     t.text     "desc"
     t.string   "typ"
     t.datetime "created_at", :null => false
@@ -160,6 +173,7 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
   create_table "studium_translations", :force => true do |t|
     t.string   "locale"
     t.text     "desc"
+    t.text     "shortdesc"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
     t.integer  "studien_id"