From 9ec7bdd6cbb25418563b3c96f0fb0087f5d11c7c Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fetsitetest.fet.htu.tuwien.ac.at>
Date: Thu, 22 Aug 2013 17:52:56 +0200
Subject: [PATCH 1/3] fotos - resized

---
 app/views/galleries/show.html.erb | 2 +-
 config/initializers/devise.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 7b9e440..521f458 100644
--- a/app/views/galleries/show.html.erb
+++ b/app/views/galleries/show.html.erb
@@ -32,7 +32,7 @@
 <div id="gallery" data-toggle="modal-gallery" data-target="#modal-gallery">
 <% @gallery.fotos.each do |f| %>
 
-<a href="<%= f.datei.url%>" title="<%=f.title%>" data-gallery="gallery">
+<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
 <%=image_tag(f.datei.big_thumb.url,{:class=>"img-polaroid"}) %></a>
 <% # image_tag(f.datei.url, :data => {:gallery => "gallery"}, :title => "Apple") %>
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 765c261..5c4d4b8 100755
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -7,7 +7,7 @@ Devise.setup do |config|
   config.mailer_sender = "test@example.com"
 
   # Configure the class responsible to send e-mails.
- # config.mailer = "Devise::Mailer"
+  config.mailer = "Devise::Mailer"
     config.mailer.default_url_options = { :host => 'glonass.htu.tuwien.ac.at' }  
   config.mailer.delivery_method = :sendmail
 #  config.mailer.smtp_settings = {

From cd3f3c2b89ae24a910254a34889bd202508c39a8 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Thu, 22 Aug 2013 18:45:08 +0200
Subject: [PATCH 2/3] fix upload & gallery

---
 app/views/fotos/_form_bulk.html.erb |  8 ++++----
 app/views/galleries/show.html.erb   | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/views/fotos/_form_bulk.html.erb b/app/views/fotos/_form_bulk.html.erb
index 283bfa3..a0f6332 100644
--- a/app/views/fotos/_form_bulk.html.erb
+++ b/app/views/fotos/_form_bulk.html.erb
@@ -28,7 +28,7 @@
     <div class="span5">
       <!-- The global progress bar -->
       <div class="progress progress-success progress-striped active fade">
-        <div class="bar" style="width:0%;"></div>
+        <div class="bar" style="width:100%;"></div>
       </div>
     </div>
   </div>
@@ -56,7 +56,7 @@
 <script id="template-upload" type="text/x-tmpl">
   {% for (var i=0, file; file=o.files[i]; i++) { %}
   <tr class="template-upload fade">
-    <td class="preview"><span class="fade"></span></td>
+    <!--<td class="preview"><span class="fade"></span></td>-->
     <td class="name"><span>{%=file.name%}</span></td>
     <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
     {% if (file.error) { %}
@@ -93,9 +93,9 @@
     <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
     <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
     {% } else { %}
-    <td class="preview">{% if (file.thumbnail_url) { %}
+    <!--<td class="preview">{% if (file.thumbnail_url) { %}
       <a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
-      {% } %}</td>
+      {% } %}</td>-->
     <td class="name">
       <a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
     </td>
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 7b9e440..8b38415 100644
--- a/app/views/galleries/show.html.erb
+++ b/app/views/galleries/show.html.erb
@@ -1,3 +1,4 @@
+
 <p id="notice"><%= notice %></p>
 
 <p>
@@ -34,7 +35,6 @@
 
 <a href="<%= f.datei.url%>" title="<%=f.title%>" data-gallery="gallery">
 <%=image_tag(f.datei.big_thumb.url,{:class=>"img-polaroid"}) %></a>
-<% # image_tag(f.datei.url, :data => {:gallery => "gallery"}, :title => "Apple") %>
 
 
 <% end %>
@@ -47,3 +47,11 @@
 <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">
+  $(function (){
+//$('#modal-gallery').addClass('modal-fullscreen');
+$('#modal-gallery').addClass('modal-fullscreen modal-fullscreen-stretch');
+  });
+</script>

From 12b453fdc8d93fd95f6eaf9d291e940407a056f4 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Thu, 22 Aug 2013 19:00:39 +0200
Subject: [PATCH 3/3] gallery now default on fullscreen

---
 app/views/galleries/show.html.erb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 8b38415..95849b0 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-gallery hide fade" tabindex="-1">
+<div id="modal-gallery" class="modal modal-fullscreen modal-gallery hide fade" tabindex="-1">
     <div class="modal-header">
         <a class="close" data-dismiss="modal">&times;</a>
         <h3 class="modal-title"></h3>
@@ -47,11 +47,3 @@
 <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">
-  $(function (){
-//$('#modal-gallery').addClass('modal-fullscreen');
-$('#modal-gallery').addClass('modal-fullscreen modal-fullscreen-stretch');
-  });
-</script>