Oberfläche aufräumen...
This commit is contained in:
@@ -10,6 +10,8 @@ class FetprofilesController < ApplicationController
|
||||
@fetprofiles = Fetprofile.where(:active=>false).order(:vorname,:nachname) if params[:filter]== "notactive"
|
||||
|
||||
@gremientabs = Gremium.tabs
|
||||
@toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('profile.new_profile'),:path => new_fetprofile_path(@fetprofile) } if can? :new, @fetprofile
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
end
|
||||
@@ -87,7 +89,13 @@ class FetprofilesController < ApplicationController
|
||||
|
||||
respond_to do |format|
|
||||
if @fetprofile.update_attributes(params[:fetprofile])
|
||||
format.html { redirect_to @fetprofile, notice: 'Fetprofile was successfully updated.' }
|
||||
format.html {
|
||||
unless params[:button]=="continue" || params[:commit]=="continue"
|
||||
redirect_to @fetprofile, notice: 'Fetprofile was successfully updated.'
|
||||
else
|
||||
redirect_to edit_fetprofile_path(@fetprofile), notice: 'Fetprofile was successfully updated.'
|
||||
end
|
||||
}
|
||||
format.json { head :no_content }
|
||||
else
|
||||
@memberships=@fetprofile.memberships.order(:typ)
|
||||
|
||||
@@ -6,7 +6,7 @@ class GalleriesController < ApplicationController
|
||||
# GET /galleries.json
|
||||
def index
|
||||
@galleries = Gallery.all
|
||||
@toolbar_elements << {:hicon => 'icon-plus', :text => I18n.t('fotos.new-gallery'), :path => new_gallery_path }
|
||||
@toolbar_elements << {:hicon => 'icon-plus', :text => I18n.t('fotos.new-gallery'), :path => new_gallery_path } if can? :new, Gallery
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
|
||||
@@ -7,7 +7,7 @@ class StudienController < ApplicationController
|
||||
@topbar_elements=[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
|
||||
@topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
|
||||
@topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}
|
||||
@toolbar_elements<<{:icon =>:plus, :hicon=>'icon-plus-sign', :text=> I18n.t('studien.new') ,:path=>new_studium_path }
|
||||
@toolbar_elements<<{:icon =>:plus, :hicon=>'icon-plus-sign', :text=> I18n.t('studien.new') ,:path=>new_studium_path } if can? :new, Studium
|
||||
# @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path }
|
||||
end
|
||||
|
||||
@@ -31,14 +31,14 @@ class StudienController < ApplicationController
|
||||
end
|
||||
@studienphasen << {:modulgruppen=>modulgruppen, :phase => ph}.merge(opts)
|
||||
end
|
||||
|
||||
@toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) },
|
||||
{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)},
|
||||
{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_lvas_studium_path(@studium)},
|
||||
{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>'Sure?' }]
|
||||
|
||||
@toolbar_modulgruppen =[ {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)},
|
||||
{:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}]
|
||||
@toolbar_elements=[]
|
||||
@toolbar_elements<<{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) } if can? :new, Studium
|
||||
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)} if can? :edit, Studium
|
||||
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_lvas_studium_path(@studium)} if can? :edit_lvas, Studium
|
||||
@toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>'Sure?' } if can? :delete, Studium
|
||||
@toolbar_modulgruppen =[]
|
||||
@toolbar_modulgruppen << {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)} if can? :new, Modulgruppe
|
||||
@toolbar_modulgruppen << {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path} if can? :index, Modulgruppe
|
||||
case params[:ansicht]
|
||||
when 'semesteransicht'
|
||||
when 'infoansicht'
|
||||
|
||||
@@ -4,8 +4,9 @@ class ThemengruppenController < ApplicationController
|
||||
load_and_authorize_resource
|
||||
def index
|
||||
@themengruppen = Themengruppe.where(:public=>true).order(:priority).reverse
|
||||
@toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}]
|
||||
@toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.manage_all'), :path=>verwalten_all_themengruppen_path()}]
|
||||
@toolbar_elements = []
|
||||
@toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()} if can? :new, Themengruppe
|
||||
@toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.manage_all'), :path=>verwalten_all_themengruppen_path()} if can? :verwalten_all, Themengruppe
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
|
||||
@@ -63,7 +63,7 @@ end
|
||||
end
|
||||
end
|
||||
def text
|
||||
I18n.l(self.start) +" bis "+ I18n.l(self.ende)
|
||||
I18n.l(self.start) +" "+ I18n.t("cal.bis")+" "+ I18n.l(self.ende)
|
||||
end
|
||||
scope :public, -> { where(:public => :true) }
|
||||
# scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 28.days.from_now) }
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</div> </div>
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<%= f.input :desc %>
|
||||
<%= f.input :desc , input_html: {style: "width:100%"}%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
@@ -30,23 +30,30 @@
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span6">
|
||||
Adresse:
|
||||
|
||||
<%= I18n.t("fetprofile.adresse") %>:
|
||||
|
||||
<%=f.input :street %>
|
||||
<%=f.input :plz %>
|
||||
<%=f.input :city %>
|
||||
KOntakt:
|
||||
<%=f.input :instant %>
|
||||
<%=f.input :skype %>
|
||||
<table><tr><td>
|
||||
<%=f.input :plz, input_html: {style: "width:5em"} %></td>
|
||||
<td><%=f.input :city, input_html: {style: "width:5em"} %></td></tr></table>
|
||||
<%=f.input :telnr %>
|
||||
<%=f.input :hdynr %>
|
||||
|
||||
</div>
|
||||
<div class="span6">
|
||||
Geburtstag:
|
||||
<%=f.input :birth_day %>
|
||||
<%=f.input :birth_month %>
|
||||
<%=f.input :birth_year %>
|
||||
<%= I18n.t("fetprofile.geburtstag") %>:
|
||||
<table><tr>
|
||||
<td><%=f.input :birth_day, input_html: {style: "width:3em"}%></td>
|
||||
<td><%=f.input :birth_month, input_html: {style: "width:3em"} %></td>
|
||||
<td><%=f.input :birth_year, input_html: {style: "width:5em"} %></td>
|
||||
</tr></table>
|
||||
|
||||
|
||||
|
||||
<%=f.input :instant %>
|
||||
<%=f.input :skype %>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -60,7 +67,9 @@ Geburtstag:
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<%= f.actions do %>
|
||||
<%= f.action :submit, :as => :input %>
|
||||
<%= f.action :submit, :as => :input , :label=>I18n.t("common.save") %>
|
||||
<%= f.action :submit, :as => :input, :button_html=>{value: "continue"} , :label=>I18n.t("common.savecont") %>
|
||||
<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<h1>Editing fetprofile</h1>
|
||||
<h1><%= I18n.t("fetprofile.edit")%></h1>
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to 'Show', @fetprofile %> |
|
||||
<%= link_to 'Back', fetprofiles_path %>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,9 +6,15 @@
|
||||
<%= I18n.t 'profile.active_members' if params[:filter].nil? || params[:filter]== "active"
|
||||
%>
|
||||
</h1>
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<%= render 'layouts/pretty_toolbar' %>
|
||||
|
||||
<% link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul class="unstyled fetprofile_list linkbox-list" style="width:100%">
|
||||
|
||||
<% @fetprofiles.each do |fetprofile| %>
|
||||
|
||||
<li>
|
||||
@@ -39,11 +45,7 @@
|
||||
|
||||
</ul>
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<%= link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
|
||||
</div>
|
||||
</div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to I18n.t('common.back'), fetprofiles_path %>
|
||||
|
||||
|
||||
@@ -10,12 +10,7 @@
|
||||
<p>
|
||||
<%= @fetprofile.fetmail %>
|
||||
</p>
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.json { render json: @fetprofiles }
|
||||
end
|
||||
|
||||
<p>
|
||||
<p>
|
||||
<%= @fetprofile.desc %>
|
||||
</p>
|
||||
<%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<h1><%= I18n.t('fotos.galleries')%></h1>
|
||||
<%= render :partial => 'layouts/pretty_toolbar' %>
|
||||
<% @galleries.each_slice(2) do |row| %>
|
||||
<div class="row-fluid">
|
||||
<% row.each do |gallery| %>
|
||||
@@ -37,4 +38,3 @@
|
||||
<% end %>
|
||||
|
||||
<br />
|
||||
<%= render :partial => 'layouts/pretty_toolbar' %>
|
||||
|
||||
@@ -1,17 +1,12 @@
|
||||
<div class="contentbox">
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="span8">
|
||||
<h4>Neueste Beispiele in unserer Sammlung</h4>
|
||||
<h4>I18n.t("home.newexamples")</h4>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<%= link_to I18n.t("beispiel.add"), new_beispiel_path, :class=>"btn"%>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<ul class="unstyled linkbox-list">
|
||||
<% @beispiele.each do |b| %>
|
||||
<li>
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
<h1>Entwicklungsprojekt</h1>
|
||||
<%= link_to "notimplemented", home_linksnotimplemented_path %>
|
||||
<h2>Feature List: 2013-07-17</h2>
|
||||
<ul>
|
||||
<li>Info zu Studien/Studienpläne</li>
|
||||
<li>Info zu LVAs</li>
|
||||
<li>Beispielsammlung</li>
|
||||
<li>Kalender</li>
|
||||
<li>Events</li>
|
||||
<li>Termine</li>
|
||||
<li>Fotos</li>
|
||||
<li>FET Mitarbeiter</li>
|
||||
<li>Personen Profile (TISS?)</li>
|
||||
<li>News</li>
|
||||
<li>Gremien - Mitgliedschaften</li>
|
||||
<li>Börse (JOBs) Sitzungsbeschluss:Derzeit Nein</li>
|
||||
<li>Lost&Found </li>
|
||||
<li>FAQ</li>
|
||||
<li>Informationen (ZB Auslandssemester, Anfänerinfo</li>
|
||||
<li>Impressum</li>
|
||||
<li>Linksammlung</li>
|
||||
<li>Fetzn</li>
|
||||
<li>FET Sitzungstops</li>
|
||||
</ul>
|
||||
<h2>Testfeatures</h2>
|
||||
<b>Neuigkeiten</b>
|
||||
<p>Wichtige Punkte die noch entwickelt werden sind: <ul><li>Verwaltung bestehender Nachrichten</li><li>Facebook Interface</li></ul></p>
|
||||
<p><%= link_to "Neuigkeiten", rubriken_path %></p>
|
||||
|
||||
<p><b>Wiki</b></p>
|
||||
<p></p>
|
||||
@@ -23,14 +23,11 @@
|
||||
<p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
|
||||
<p>Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden</p>
|
||||
<p><%= link_to "Getting Started" , startdev_home_index_path %></p>
|
||||
<p> Das Kalender Feature wird überarbeitet, in Zukunft soll folgender Link nicht mehr funktionieren <%= link_to "Kalender", calendars_path %>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<%= link_to "Entwicklungsstatus" , dev_home_index_path %>
|
||||
<%= render 'beispiele' %>
|
||||
|
||||
Verschiedene Styles
|
||||
<%= I18n.t("home.selectstyle") %>
|
||||
<ul>
|
||||
<li> <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %></li>
|
||||
<li> <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %></li>
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
<div class="content-column content-wrap">
|
||||
<h1>Kontakt</h1>
|
||||
<h1> <%= I18n.t "kontakt.H1" %></h1>
|
||||
<p>
|
||||
<%= I18n.t "home.kontakt" %>
|
||||
<%= I18n.t "kontakt.text" %>
|
||||
</p>
|
||||
<h2>Service</h2>
|
||||
|
||||
<h2>Impressum</h2>
|
||||
<h2>Credits</h2>
|
||||
<h2><%= I18n.t "kontakt.service" %></h2>
|
||||
<%= raw(I18n.t( "kontakt.service_text")) %>
|
||||
<h2><%= I18n.t "kontakt.adresse" %></h2>
|
||||
<p><%= raw(I18n.t("kontakt.adresse_text")) %></p>
|
||||
<p><%= raw(I18n.t ("kontakt.telefon_text")) %></p>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -5,6 +5,7 @@ Verwendung: Aufruf mit
|
||||
|
||||
-->
|
||||
<% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
|
||||
<% unless toolbar_elements.nil? || toolbar_elements.empty? %>
|
||||
<span class="label"><%= I18n.t("common.actions")%></span>
|
||||
<div class="btn-group">
|
||||
<% toolbar_elements.each do |t| %>
|
||||
@@ -14,10 +15,10 @@ Verwendung: Aufruf mit
|
||||
<% else %>
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
Versionen<span class="caret"></span>
|
||||
<%= I18n.t("common.versions") %><span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li> <%= link_to "active", t[:path] %>
|
||||
<li> <%= link_to I18n.t("common.activeversion"), t[:path] %>
|
||||
</li>
|
||||
<% t[:versions].each_with_index do |v,i| %>
|
||||
<li>
|
||||
@@ -37,3 +38,4 @@ Verwendung: Aufruf mit
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
@@ -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? %>
|
||||
<%= " "+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 %>
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
<h1><%= I18n.t("modulgruppe.show.title")%></h1>
|
||||
|
||||
|
||||
<% @modulgruppen.sort_by{|n| n[:name]}.each do |modulgruppe| %>
|
||||
<%= render modulgruppe%>
|
||||
<% end %>
|
||||
<br>
|
||||
<% 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%>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="media-body">
|
||||
<div>
|
||||
<small><%= neuigkeit.rubrik.name %></small>
|
||||
<small class="pull-right"> <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small>
|
||||
<small class="pull-right"> <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small>
|
||||
</div>
|
||||
<h1>
|
||||
<%= neuigkeit.title%>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<li>
|
||||
<li>
|
||||
<%= link_to nlink_list.link do %>
|
||||
<div class="contentbox" >
|
||||
<% p = nlink_list.link_type.downcase.pluralize+"/nlink" %>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
<%= @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? %>
|
||||
</span>
|
||||
<div class="media">
|
||||
<div class="pull-left" href="#">
|
||||
@@ -17,7 +17,6 @@
|
||||
<div class="media-body">
|
||||
<h1>
|
||||
<%= @neuigkeit.title%>
|
||||
|
||||
</h1>
|
||||
<%= raw(@neuigkeit.text) %>
|
||||
<p></p>
|
||||
@@ -29,7 +28,7 @@
|
||||
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
|
||||
</div>
|
||||
|
||||
Siehe auch:
|
||||
<%= I18n.t("neuigekeit.sieheauch") %>
|
||||
<ul class="unstyled">
|
||||
<div id="nlink_list">
|
||||
<%= render partial: "nlink_list", collection: @neuigkeit.nlinks %>
|
||||
@@ -38,9 +37,9 @@ Siehe auch:
|
||||
<%= render partial: "nlink_list_search", collection: @nlink_search %>
|
||||
</div>
|
||||
</ul>
|
||||
|
||||
<% 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 %>
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<% else %>
|
||||
<li class="pull-right">
|
||||
<% end %>
|
||||
<%= link_to "Verwaltung", verwalten_rubriken_path %>
|
||||
<%= link_to I18n.t("rubrik.management"), verwalten_rubriken_path if can? :verwalten, Rubrik %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
17
app/views/semesters/_semester.html.erb
Normal file
17
app/views/semesters/_semester.html.erb
Normal file
@@ -0,0 +1,17 @@
|
||||
<div class="contentbox">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<h2><%= semester.name %></h2>
|
||||
</div>
|
||||
<div class="span4">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<% semester.lvas.each do |lva| %>
|
||||
<div class="row-fluid">
|
||||
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
@@ -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 %>
|
||||
|
||||
<div class="container-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 %>
|
||||
|
||||
<% @studium.semester.each do |sem| %>
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<div class="contentbox">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<h2><%= sem.name %></h2>
|
||||
</div>
|
||||
<div class="span4">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<% sem.lvas.each do |lva| %>
|
||||
<div class="row-fluid">
|
||||
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% @studium.semester.each_slice(2) do |row| %>
|
||||
<div class="row-fluid">
|
||||
<% row.each do |sem| %>
|
||||
<div class="span6">
|
||||
<%= render sem %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
|
||||
|
||||
@@ -20,6 +20,6 @@
|
||||
<% else %>
|
||||
<li class="pull-right">
|
||||
<% 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 %>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<%= render 'studien/tabs' %>
|
||||
<div class="span6">
|
||||
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
|
||||
</div>
|
||||
<div class="span3 pull-right">
|
||||
<div class="pull-right">
|
||||
<%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
|
||||
<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% 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| %>
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<div class="contentbox">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="span8">
|
||||
<h2><%= sem.name %></h2>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<div class="pull-right"><!--<% link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>--></div>
|
||||
</div></div>
|
||||
<% sem.lvas.each do |lva| %>
|
||||
<div class="row-fluid">
|
||||
|
||||
|
||||
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
|
||||
|
||||
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
|
||||
</div>
|
||||
@@ -2,6 +2,7 @@
|
||||
<div class="content-wrap content-column">
|
||||
<p id="notice"><%= notice %></p>
|
||||
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
|
||||
<div>
|
||||
<p>
|
||||
<div class="pull-right">
|
||||
<%= link_to I18n.t("studien.ansicht.semester"), studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
|
||||
@@ -9,6 +10,7 @@
|
||||
<%= link_to I18n.t("studien.ansicht.info"), studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" unless params[:ansicht]=='infoansicht' %>
|
||||
</div>
|
||||
</p>
|
||||
</div>
|
||||
<% if params[:ansicht]=='modulgruppenansicht' %>
|
||||
<%= render partial: 'modulgruppenansicht' %>
|
||||
<% else if params[:ansicht]=='infoansicht' %>
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
<% verw_liste.each do |thema| %>
|
||||
<li id="themen_<%= thema.id %>" class="sort" ><div class="contentbox handle" ><h2><%= thema.title %></h2> </div>
|
||||
<%= 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 %></li>
|
||||
<li id="themen_<%= thema.id %>" class="sort" ><div class="contentbox handle" ><b><%= thema.title %></b> </div>
|
||||
|
||||
<%= 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 %></li>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user