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

app/assets/stylesheets/galleries.css.scss

@@ -1,3 +1,36 @@
 // Place all the styles related to the galleries controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.modal.fade {
+    top: -25%;
+    transition: opacity 0.3s linear 0s, top 0.3s ease-out 0s;
+}
+.modal-gallery {
+    max-height: none;
+    outline: medium none;
+    width: auto;
+}
+.modal {
+    color: #333333;
+}
+.hide {
+    display: none;
+}
+.modal {
+    background-clip: padding-box;
+    background-color: #FFFFFF;
+    border: 1px solid rgba(0, 0, 0, 0.3);
+    border-radius: 6px 6px 6px 6px;
+    box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+    left: 50%;
+    margin-left: -280px;
+    outline: medium none;
+    position: fixed;
+    top: 10%;;
+    z-index: 1050;
+}
+.fade {
+    opacity: 0;
+    transition: opacity 0.15s linear 0s;
+}

app/controllers/fetprofiles_controller.rb

@@ -3,7 +3,7 @@ class FetprofilesController < ApplicationController
   # GET /fetprofiles.json
   def index
     
-    @fetprofiles = Fetprofile.active
+    @fetprofiles = Fetprofile.active.order(:vorname,:nachname)
     @fetprofiles = Fetprofile.order(:vorname,:nachname) if params[:filter]== "all"
 	@gremientabs=Gremium.order(:typ)
     respond_to do |format|

app/inputs/datepicker_input.rb

@@ -0,0 +1,6 @@
+class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
+	def input_html_options
+		super.merge(:class => "datepicker")
+	end
+	
+end

app/views/calendars/_tabs.html.erb

@@ -1,6 +1,6 @@
 <ul class="nav nav-tabs">
  <li <%= (request.fullpath == "")? 'class="active"'.html_safe : ''%> >
- <%= link_to I18n.t 'calendars.alle' , calendars_path %> </li>
+ <%= link_to I18n.t('calendars.alle') , calendars_path %> </li>
 <% for c in Calendar.all %>
   <li <%= (!@calendar.nil? && c == @calendar) ? 'class="active"'.html_safe : '' %> title="<%= c.name %>">
     <%= link_to c.name, c %>

app/views/calentries/_form.html.erb

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

app/views/galleries/show.html.erb

@@ -16,7 +16,7 @@
   <%= @gallery.datum %>
 </p>
 <!-- modal-gallery is the modal dialog used for the image gallery -->
-<div id="modal-gallery" class="modal modal-fullscreen modal-gallery hide fade" tabindex="-1">
+<div id="modal-gallery" class="modal hide fade modal-gallery modal-fullscreen modal-loading" tabindex="-1">
     <div class="modal-header">
         <a class="close" data-dismiss="modal">&times;</a>
         <h3 class="modal-title"></h3>
@@ -47,3 +47,7 @@
 <script src="js/bootstrap.js"></script>
 <script src="js/load-image.js"></script>
 <script src="js/bootstrap-image-gallery.js"></script>
+<script type="text/javascript">
+
+//$('#modal-gallery.fade').css('top', '50%');
+  </script>

app/views/neuigkeiten/_form.html.erb

@@ -3,7 +3,7 @@
   <%= f.inputs do %>
     <%= f.input :title, :placeholder=>"Titel" %>
     <%= f.input :text, :as=>:tinymce_text %>
-    <% f.input :datum %>
+    <% f.input :datum, :as=>:datepicker %>
     <%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %>
     <%= f.input :author, :as=>:radio %>
     <%= f.input :picture, :as=>:file %>
@@ -13,4 +13,5 @@
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+<script>$('.datepicker').datepicker()</script>
 <%= tinymce %>