Merge branch 'master' of github.com:fetsite/fetsite

Conflicts:
	Gemfile.lock

Gemfile.lock

@@ -1,256 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    annotate (2.5.0)
-      rake
-    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-addons-rails (0.1.2)
-      rails
-    bootstrap-sass (2.3.2.1)
-      sass (~> 3.2)
-    builder (3.0.4)
-    cancan (1.6.9)
-    carrierwave (0.9.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
-    cocaine (0.4.2)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.4.0)
-    devise (2.2.3)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    formtastic (2.2.1)
-      actionpack (>= 3.0)
-    formtastic-bootstrap (2.1.3)
-      formtastic (~> 2.2)
-    git (1.2.5)
-    globalize3 (0.3.0)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      paper_trail (~> 2)
-    haml (4.0.0)
-      tilt
-    hashie (2.0.5)
-    hike (1.2.1)
-    httpauth (0.2.0)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-fileupload-rails (0.4.1)
-      actionpack (>= 3.1)
-      railties (>= 3.1)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    libv8 (3.11.8.13)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.21)
-    mini_portile (0.5.2)
-    multi_json (1.5.1)
-    multipart-post (1.2.0)
-    mysql2 (0.3.13)
-    net-ldap (0.2.2)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.0-x86-mingw32)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      rack (~> 1.2)
-    omniauth (1.1.4)
-      hashie (>= 1.2, < 3)
-      rack
-    omniauth-facebook (1.4.1)
-      omniauth-oauth2 (~> 1.1.0)
-    omniauth-ldap (1.0.3)
-      net-ldap (~> 0.2.2)
-      omniauth (~> 1.0)
-      pyu-ruby-sasl (~> 0.0.3.1)
-      rubyntlm (~> 0.1.1)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
-    orm_adapter (0.4.0)
-    paper_trail (2.7.0)
-      activerecord (~> 3.0)
-      railties (~> 3.0)
-    paperclip (3.4.0)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.4.0)
-      mime-types
-    polyglot (0.3.3)
-    pyu-ruby-sasl (0.0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    ref (1.0.2)
-    rmagick (2.13.2)
-    rolify (3.2.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-rails (2.14.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rubyntlm (0.1.1)
-    sanitize (2.0.6)
-      nokogiri (>= 1.4.4)
-    sass (3.2.5)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    seed_dump (0.5.3)
-    simple_calendar (0.1.9)
-      rails (>= 3.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    sqlite3 (1.3.7-x86-mingw32)
-    therubyracer (0.11.3)
-      libv8 (~> 3.11.8.12)
-      ref
-    thor (0.17.0)
-    tilt (1.3.3)
-    tinymce-rails (3.5.8)
-      railties (>= 3.1.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    warden (1.2.1)
-      rack (>= 1.0)
-
-PLATFORMS
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  annotate (>= 2.5.0)
-  awesome_nested_set
-  bootstrap-addons-rails
-  bootstrap-sass (~> 2.3.2.1)
-  cancan
-  carrierwave (~> 0.9.0)
-  coffee-rails (~> 3.2.1)
-  devise (~> 2.2.3)
-  execjs (~> 1.4.0)
-  factory_girl_rails
-  formtastic (~> 2.2.1)
-  formtastic-bootstrap (~> 2.1.3)
-  git
-  globalize3 (~> 0.3.0)
-  haml
-  jquery-fileupload-rails
-  jquery-rails
-  mysql2
-  omniauth
-  omniauth-facebook
-  omniauth-ldap
-  paper_trail (>= 2.7.0)
-  paperclip (~> 3.4.0)
-  rails (= 3.2.9)
-  rmagick
-  rolify
-  rspec-rails
-  sanitize
-  sass-rails (~> 3.2)
-  seed_dump (~> 0.5.3)
-  simple_calendar (~> 0.1.9)
-  sqlite3
-  therubyracer
-  tinymce-rails (>= 3.5.8)
-  uglifier (>= 1.0.3)

app/controllers/themengruppen_controller.rb

@@ -3,7 +3,7 @@ class ThemengruppenController < ApplicationController
   # GET /themengruppen.json
   load_and_authorize_resource
   def index
-    @themengruppen = Themengruppe.all
+    @themengruppen = Themengruppe.order(:title)
     @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}]
 
     respond_to do |format|

app/models/lva.rb

@@ -50,7 +50,11 @@ class Lva < ActiveRecord::Base
   validates :name, :presence=>true, :uniqueness=>{:scope=>:typ}# Name Eingetragen?
   validates :typ, :presence=>true, :inclusion=> ERLAUBTE_TYPEN
   validates_presence_of :stunden # Stunden Eingetragen?
-  validates_presence_of :modul # Zugehöriges Modul eingetragen? (zumindest eines)
+  validates_presence_of :modul # Zugehöriges Modul eingetragen?
+  # (zumindest eines)
+  def full_name
+    return self.typ + ' ' + self.name
+    end
   def add_semesters
     # Diese Methode fügt die Instanz automatisch zu allen Studien als "Ohne Semesterempfehlung" (Semester 0) zu, bei denen die Instanz im Studium noch nicht vorkommt.
     for m in self.modul

app/views/home/_beispiele.html.erb

@@ -18,7 +18,7 @@
      <%= link_to b, {:class=> :linkbox} do %>
        <div class="row-fluid">
      <div class="span8">
- <b><%=b.name%></b> (<%=b.lva.name%>)
+ <b><%=b.name%></b> (<%=b.lva.full_name%>)
 	  </div>
 	  <div class="span4">
 	    <%=b.updated_at.to_s%>

app/views/lvas/_lva_semester.html.erb

@@ -1,6 +1,6 @@
 
 <div class="lva-semester">
- <%=lva.lvanr.to_s %> <b><%= link_to lva.name, lva_path(lva)%></b>  <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
+ <%=lva.lvanr.to_s %> <b><%= link_to lva.full_name, lva_path(lva)%></b>  <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
 <!--  <div class="hidden-phone">
   Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
 <br>

app/views/studien/show.html.erb

@@ -9,7 +9,13 @@
     </div>
   </div>
   <div class="row-fluid">
+    <% 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 %>
+
+
     <% @studienphasen.each do |sp| %>
       <% sp[:modulgruppen].each do |row| %>
 	<div class="row-fluid">

app/views/studien/verwalten.html.erb

@@ -127,7 +127,7 @@
 	    
 
 	    <% @lvas.each do |lva| %>
-	    <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %><%= link_to lva.name, lva %> |	      
+	    <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %><%= link_to lva.full_name, lva %> |	      
 	    <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
 	    
 	    <% end %>

app/views/themengruppen/_themengruppe.html.erb

@@ -26,7 +26,7 @@
   <div class="span6">
     <!--<b><%= I18n.t("themengruppe.themen") %></b>
     --><ul>
-      <% themengruppe.themen.each do |t| %>
+      <% themengruppe.themen.order(:title).each do |t| %>
       <li>
 	<%= render t %>
       </li>

config/environments/production.rb

@@ -15,7 +15,7 @@ Fetsite::Application.configure do
   config.assets.compress = true
 
   # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Generate digests for assets URLs
   config.assets.digest = true