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

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>

app/views/galleries/show.html.erb

@@ -1,3 +1,4 @@
+
 <p id="notice"><%= notice %></p>
 
 <p>
@@ -15,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>
@@ -32,9 +33,8 @@
 <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") %>
 
 
 <% end %>

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 = {