Abkürzungen zu Studien hinzugefügt

app/models/studium.rb

@@ -12,14 +12,17 @@
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 class Studium < ActiveRecord::Base
-  attr_accessible :desc, :name, :typ, :zahl, :semester
+  attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester
   has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy
   has_many :semester, :dependent => :destroy
-  
+  validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
   validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
   validates :name, :uniqueness => true, :presence=>true
   validates :zahl, :presence=>true, :format=>{:with=>/^0(33|66)[0-9]{3}$/}, :uniqueness => true 
   translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true
+  def title_context
+    return self.abkuerzung.strip.empty? ? self.name : self.abkuerzung
+  end
   
   def batch_add_semester
     # Semester automatisch zu Studien hinzufügen

app/views/lvas/show.html.erb

@@ -45,7 +45,7 @@
 	    <ul>
 	      <% modul.modulgruppen.each do |g| %>
 
-	      <li><%= link_to g.studium.name , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
+	      <li><%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
 	      <% end %>
 	    </ul>
 	  </li>

app/views/modulgruppen/_kurz.html.erb

@@ -1 +1 @@
-<b><%=link_to modulgruppe.name, modulgruppe %></b> <%= ' ( ' + modulgruppe.studium.name + ')' unless modulgruppe.studium.nil? %>
+<b><%=link_to modulgruppe.name, modulgruppe %></b> <%= ' ( ' + modulgruppe.studium.title_context + ')' unless modulgruppe.studium.nil? %>

app/views/studien/_form.html.erb

@@ -5,18 +5,15 @@
   <%= f.inputs do %>
 
   <div class="row-fluid">
-    <div class="span6">
-      <%= f.input :name,:append=>"NAME" %>
-    </div>
-    <div class="span3">
-      <%= f.input :zahl %>
-    </div>
-    <div class="span3">
-      <%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"]%>
-    </div>
+      <%= f.input :name,:append=>"NAME", :wrapper_html=>{:class=>"span6"}%>
+
+      <%= f.input :abkuerzung, :wrapper_html=>{:class=>"span1"}%>
+      <%= f.input :zahl , :wrapper_html=>{:class=>"span2"}%>
+
+      <%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"], :wrapper_html=>{:class=>"span2"}%>
   </div>
   <div class="row-fluid">
-    <%= f.input :desc, :as=>:tinymce_text %>
+    <%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
   </div>
 
   <% end %>

app/views/studien/_tabs.html.erb

@@ -7,17 +7,18 @@
   <%= link_to "Alle Studien", studien_path %> </li>
 <% for s in Studium.all %>
   <% if !@studium.nil? && s == @studium %>
-    <li class="active">
-      <%= link_to s.name, s %>
+ 
+    <li class="active" title="<%= s.name %>">
+      <%= link_to s.title_context, s %>
     </li>
   <% else %>
-    <li> <%= link_to s.name, s %></li>
+    <li title="<%= s.name %>"> <%= link_to s.title_context, s %></li>
   <% end %>
 <% end %>
 <% if request.fullpath == studien_verwalten_path %>
-  <li class="active">
+  <li class="active pull-right">
   <% else %>
-  <li>
+  <li class="pull-right">
 <% end %>
 <%= link_to "Verwaltung", studien_verwalten_path %>
 </li>