andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

fix upload & gallery

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-22 18:45:08 +02:00
parent ab4c80104f
commit cd3f3c2b89
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/fotos/_form_bulk.html.erb
View File

@@ -28,7 +28,7 @@
<div class="span5"> <div class="span5">
<!-- The global progress bar --> <!-- The global progress bar -->
<div class="progress progress-success progress-striped active fade"> <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> </div>
</div> </div>
@@ -56,7 +56,7 @@
<script id="template-upload" type="text/x-tmpl"> <script id="template-upload" type="text/x-tmpl">
{% for (var i=0, file; file=o.files[i]; i++) { %} {% for (var i=0, file; file=o.files[i]; i++) { %}
<tr class="template-upload fade"> <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="name"><span>{%=file.name%}</span></td>
<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td> <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
{% if (file.error) { %} {% if (file.error) { %}
@@ -93,9 +93,9 @@
<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td> <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> <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
{% } else { %} {% } 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> <a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
{% } %}</td> {% } %}</td>-->
<td class="name"> <td class="name">
<a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a> <a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
</td> </td>

10
app/views/galleries/show.html.erb
View File

@@ -1,3 +1,4 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<p> <p>
@@ -34,7 +35,6 @@
<a href="<%= f.datei.url%>" title="<%=f.title%>" data-gallery="gallery"> <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.big_thumb.url,{:class=>"img-polaroid"}) %></a>
<% # image_tag(f.datei.url, :data => {:gallery => "gallery"}, :title => "Apple") %>
<% end %> <% end %>
@@ -47,3 +47,11 @@
<script src="js/bootstrap.js"></script> <script src="js/bootstrap.js"></script>
<script src="js/load-image.js"></script> <script src="js/load-image.js"></script>
<script src="js/bootstrap-image-gallery.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>