From 065389dfa4575c3c3ad51ce3f0be329c40cc6f7a Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 25 Aug 2013 20:07:57 +0200
Subject: [PATCH 1/6] datepicker

---
 app/inputs/datepicker_input.rb       | 6 ++++++
 app/views/calentries/_form.html.erb  | 5 +++--
 app/views/neuigkeiten/_form.html.erb | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 app/inputs/datepicker_input.rb

diff --git a/app/inputs/datepicker_input.rb b/app/inputs/datepicker_input.rb
new file mode 100644
index 0000000..e91e71c
--- /dev/null
+++ b/app/inputs/datepicker_input.rb
@@ -0,0 +1,6 @@
+class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
+	def input_html_options
+		super.merge(:class => "datepicker")
+	end
+	
+end
diff --git a/app/views/calentries/_form.html.erb b/app/views/calentries/_form.html.erb
index eb9bb02..f82c63b 100644
--- a/app/views/calentries/_form.html.erb
+++ b/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>
diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb
index 347cfdd..2c91a2e 100755
--- a/app/views/neuigkeiten/_form.html.erb
+++ b/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 %>

From 6dbbaf588b7d21d23990fe3d503d181b92d03672 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 25 Aug 2013 20:08:11 +0200
Subject: [PATCH 2/6] fetprofile order

---
 app/controllers/fetprofiles_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb
index 587182a..79242f4 100644
--- a/app/controllers/fetprofiles_controller.rb
+++ b/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|

From 5b316f8780b81886f735d18415abe5d51c54ec3d Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Tue, 27 Aug 2013 00:32:53 +0200
Subject: [PATCH 3/6] css fuer gallery viewer

---
 app/assets/stylesheets/galleries.css.scss | 3 +++
 app/views/galleries/show.html.erb         | 6 +++++-
 config/omniauth_secrets.yml.example       | 4 ----
 3 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 config/omniauth_secrets.yml.example

diff --git a/app/assets/stylesheets/galleries.css.scss b/app/assets/stylesheets/galleries.css.scss
index f88f6f2..0195ed2 100644
--- a/app/assets/stylesheets/galleries.css.scss
+++ b/app/assets/stylesheets/galleries.css.scss
@@ -1,3 +1,6 @@
 // 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.in {
+  
+}
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 052f027..a5b9d10 100644
--- a/app/views/galleries/show.html.erb
+++ b/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" 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>
diff --git a/config/omniauth_secrets.yml.example b/config/omniauth_secrets.yml.example
deleted file mode 100644
index 3ec8a3d..0000000
--- a/config/omniauth_secrets.yml.example
+++ /dev/null
@@ -1,4 +0,0 @@
-
-facebook:
-  appid: "<appid>"
-  secret: "<secret>"

From a106a278c3ec3e364d0693d664f5c95efb90aa18 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Tue, 27 Aug 2013 00:33:53 +0200
Subject: [PATCH 4/6] umbenennung

---
 config/omniauth_secrets.yml.example | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 config/omniauth_secrets.yml.example

diff --git a/config/omniauth_secrets.yml.example b/config/omniauth_secrets.yml.example
new file mode 100644
index 0000000..3ec8a3d
--- /dev/null
+++ b/config/omniauth_secrets.yml.example
@@ -0,0 +1,4 @@
+
+facebook:
+  appid: "<appid>"
+  secret: "<secret>"

From ac254ffbc21a0bc9035aa9e258857835f438b77d Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Tue, 27 Aug 2013 08:42:12 +0200
Subject: [PATCH 5/6] =?UTF-8?q?Show=20CSS=20ver=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/galleries.css.scss | 34 +++++++++++++++++++++--
 app/views/galleries/show.html.erb         |  4 +--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/galleries.css.scss b/app/assets/stylesheets/galleries.css.scss
index 0195ed2..26654c0 100644
--- a/app/assets/stylesheets/galleries.css.scss
+++ b/app/assets/stylesheets/galleries.css.scss
@@ -1,6 +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.in {
-  
+
+.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;
+}
\ No newline at end of file
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index a5b9d10..2e56349 100644
--- a/app/views/galleries/show.html.erb
+++ b/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 hide fade modal-gallery modal-fullscreen" 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>
@@ -49,5 +49,5 @@
 <script src="js/bootstrap-image-gallery.js"></script>
 <script type="text/javascript">
 
-$('#modal-gallery.fade').css('top', '50%');
+//$('#modal-gallery.fade').css('top', '50%');
   </script>

From b92be5b141b70400bd18e37d221db44e36fb9f25 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Tue, 27 Aug 2013 16:44:17 +0200
Subject: [PATCH 6/6] fix calendar index show

---
 app/views/calendars/_tabs.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/calendars/_tabs.html.erb b/app/views/calendars/_tabs.html.erb
index 07d259a..9db47ba 100644
--- a/app/views/calendars/_tabs.html.erb
+++ b/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 %>