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

app/controllers/gremien_controller.rb

@@ -1,7 +1,7 @@
 class GremienController < ApplicationController
   # GET /gremien
   # GET /gremien.json
-  def index
+  def verwalten
     @gremien = Gremium.all
 	@gremientabs=Gremium.all
     respond_to do |format|

app/controllers/neuigkeiten_controller.rb

@@ -1,34 +1,41 @@
 class NeuigkeitenController < ApplicationController
  before_filter {@toolbar_elements=[]}
   load_and_authorize_resource
-  def index
-    @neuigkeiten = Neuigkeit.all
-  end
+  #def index
+  #  @neuigkeiten = Neuigkeit.all
+  #end
 
 
   def show
     @neuigkeit = Neuigkeit.find(params[:id])
-    if can? :edit, @neuigkeit
-	@toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_neuigkeit_path(@neuigkeit),:icon=>:pencil}
-	@toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => neuigkeit_path(@neuigkeit), :method=> :delete,:confirm=>"Sure?" }
-    @toolbar_elements << {:hicon=>'icon-plus', :text=> "publish",:path => neuigkeit_publish_path(@neuigkeit),:confirm=>"Sure?" }
+	if params[:verwalten]
+    @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can? :publish, @neuigkeit
+
+	@toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit
+	@toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>"Sure?" } if can? :delete, @neuigkeit
+    else
+    @toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit,{:verwalten=>true}),:icon=>:pencil} if can? :verwalten, @neuigkeit
 
     end
   end
 
-  def new
+    def new
     @neuigkeit = Neuigkeit.new
     @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil?
     @neuigkeit.rubrik=@rubrik unless @rubrik.nil?
- end
+   end
 
-  def publish 
+   def publish 
     @neuigkeit = Neuigkeit.find(params[:id])
     @neuigkeit.publish
     @neuigkeit.save
+    if params[:verwalten] 
+		redirect_to verwalten_rubrik_path(@neuigkeit.rubrik)
+    end
     redirect_to @neuigkeit
-  end 
-  def edit
+
+   end 
+   def edit
     @neuigkeit = Neuigkeit.find(params[:id])
   end
 
@@ -38,7 +45,7 @@ class NeuigkeitenController < ApplicationController
  
     respond_to do |format|
       if @neuigkeit.save
-        format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully created.' }
+        format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' }
      
       else
         format.html { render action: "new" }

app/inputs/datepicker_input.rb

@@ -1,6 +1,24 @@
 class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
 	def input_html_options
-		super.merge(:class => "datepicker")
+		super.merge(:class => "input-append date")
+	end
+	def html_options
+		super.merge(:default => Date.today)
+	end
+	def wrapper_html_options
+		super.merge(:class=>"datepicker",'date-date-format'.to_sym=>"%d.%m.%Y")
+	end
+	def controls_wrapper_html_options
+		super.merge(:class=> "controls", 'date-date'.to_sym =>Time.now.to_date.to_s)
+	end
+	#def to_html
+	#	bootstrap_wrapping do
+     #       builder.text_field(method, input_html_options)
+	#	end
+	#end
+	def options
+		super#d.merge(:class=>"datepicker")
+		#super.merge(:append_content=>'<span class="add-on input-append"
+		#super.merge(:append_content=>'<span class="add-on" ><i class="icon-th"></i></span>')
 	end
-	
 end

app/models/neuigkeit.rb

@@ -22,7 +22,7 @@ class Neuigkeit < ActiveRecord::Base
   translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true
   has_one :calentry, :as => :object
   mount_uploader :picture, PictureUploader
-  scope :published, -> {where("datum <= ? AND datum IS NOT NULL", Time.now.to_date)}
+  scope :published, -> {where("datum <= ? AND datum IS NOT NULL", Time.now.to_date).order(:datum).reverse_order}
   scope :recent, -> { published.where("updated_at >= ? ",Time.now - 7.days)}
   def datum_nilsave
 	self.datum.nil? ? Time.now + 42.years : self.datum

app/views/calendars/show.html.erb

@@ -17,14 +17,14 @@
 <ul class="list-group">
 <% @calendar.calentries.each do |entry| %>
 <li class="list-group-item">
-<%= link_to entry.summary+ " - " + I18n.l(entry.start1), entry %>
+<%= link_to entry.summary.to_s+ " - " + I18n.l(entry.start1), entry %>
 </li>
 <% end %>
 </ul>
 </div>
  <div class="row-fluid">
 <%= calendar @calendar.calentries do |entry| %>
-  <div><%= link_to entry.name, entry %></div>
+  <div><%= link_to entry.name.to_s, entry %></div>
 <% end %>
 </div>
  <div class="row-fluid">

app/views/calentries/_form.html.erb

@@ -3,7 +3,7 @@
   <%= f.inputs do %>
  <div class="row-fluid">
  <div class="span6">
-    <%= f.input :start , :as => :date_string %>
+    <%= f.input :start , :as => :date_string, :append=>'sadf'  %>
  </div>
  <div class="span6">
     <%= f.input :ende , :as => :datepicker %>
@@ -11,7 +11,7 @@
  </div>
  <div class="row-fluid">  
  <div class="span12">
-    <%= f.input :summary %>
+    <%= f.input :summary, :append=>'g' %>
  </div>
  </div>
  <div class="row-fluid">
@@ -23,7 +23,9 @@
  </div>
  </div>
   <% end %>
-  <div class="row-fluid"><script>$('.datepicker').datepicker()</script>
+  <div class="row-fluid">
+		  <script>$('.datepicker').datepicker()</script>  
+
   <div class="span12">
   <%= f.actions do %>
     <%= f.action :submit, :as => :input_ %>
@@ -32,4 +34,4 @@
   </div>
 <% end %>
 </div>
-<script>$('.datepicker').datepicker()</script>
+

app/views/fetprofiles/_tabs.html.erb

@@ -13,12 +13,12 @@
 
 
 <% if can?(:verwalten,Gremium) %>
-<% if request.fullpath == gremien_path %>
+<% if request.fullpath == verwalten_gremien_path %>
   <li class="active pull-right">
   <% else %>
   <li class="pull-right">
 <% end %>
-<%= link_to "Verwaltung", gremien_path %>
+<%= link_to "Verwaltung", verwalten_gremien_path %>
 </li>
 <% end %>
 </ul>

app/views/layouts/_pretty_toolbar.html.erb

@@ -8,6 +8,6 @@ Verwendung: Aufruf mit
 <span class="label"><%= I18n.t("common.actions")%></span>
  <div class="btn-group">
 <% toolbar_elements.each do |t| %>
-      <%= link_to '<i class="'.html_safe+ t[:hicon].to_s.html_safe + '"></i>'.html_safe+t[:text], t[:path], :method=>t[:method], :confirm=>t[:confirm].to_s, :data=>t[:data], :class=>"btn" %>
+      <%= link_to '<i class="'.html_safe+ t[:hicon].to_s.html_safe + '"></i>'.html_safe+t[:text], t[:path], :method=>t[:method], :confirm=>t[:confirm].to_s, :data=>t[:data], :class=>((t[:method].to_s=='delete') ? "btn btn-danger" : "btn") %>
     <% end %>
 </div>

app/views/neuigkeiten/_form.html.erb

@@ -1,5 +1,5 @@
 <%= tinymce_assets %>
-<%= semantic_form_for @neuigkeit do |f| %>
+<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
   <%= f.inputs do %>
     <%= f.input :title, :placeholder=>"Titel" %>
     <%= f.input :text, :as=>:tinymce_text %>

app/views/neuigkeiten/_neuigkeit.html.erb

@@ -1,5 +1,5 @@
 
-<%= link_to neuigkeit do %>
+<%= link_to [neuigkeit.rubrik,neuigkeit] do %>
 <div class="media">
 	<div class="pull-left" href="#">
 		<p><br><%= image_tag neuigkeit.picture.thumb.url  unless neuigkeit.picture.url.nil? %></p>

app/views/neuigkeiten/show.html.erb

@@ -22,11 +22,11 @@
 			<p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.url  %></p>
 		</div>
 		<div class="media-body">
-			<h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit)  %></h1>
+			<h1><%= link_to @neuigkeit.title,rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)  %></h1>
 			<%= raw(@neuigkeit.text) %>
 			<p></p>
 		</div>
 	</div>
   </div>
 
-<%= toolbar_html (@toolbar_elements) %>
+<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>

app/views/rubriken/_tabs.html.erb

@@ -7,12 +7,12 @@
     </li>
 <% end %>
 <% if can? :verwalten, Rubrik%>
-<% if request.fullpath == rubriken_verwalten_path %>
+<% if request.fullpath == verwalten_rubriken_path %>
   <li class="active pull-right">
   <% else %>
   <li class="pull-right">
 <% end %>
-<%= link_to "Verwaltung", rubriken_verwalten_path %>
+<%= link_to "Verwaltung", verwalten_rubriken_path %>
 </li>
 <% end %>
 </ul>

app/views/rubriken/alle_verwalten.html.erb

@@ -1 +1,5 @@
+
 <%= render :partial=>"admin_liste", :locals=>{:rubriken=>@rubriken} %>
+
+
+<%= link_to 'New Rubrik', new_rubrik_path unless cannot?(:new, Rubrik) %>

app/views/rubriken/index.html.erb

@@ -10,6 +10,3 @@
 
 
 
-<br />
-
-<%= link_to 'New Rubrik', new_rubrik_path unless cannot?(:new, Rubrik) %>

app/views/rubriken/show.html.erb

@@ -32,8 +32,6 @@
 <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>
 <%= toolbar_html(@toolbar_elements)%>
 

app/views/rubriken/verwalten.html.erb

@@ -19,3 +19,4 @@
 <% end %>
 <%= link_to 'Edit', edit_rubrik_path(@rubrik) %> |
 <%= link_to 'Anzeigen', rubrik_path(@rubrik) %>
+<%= link_to 'Destroy', @rubrik, method: :delete, data: { confirm: 'Are you sure?' } %>