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

gallery div fix

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-28 17:56:26 +01:00
parent c55a2479e8
commit 97b646ec7d
2 changed files with 168 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/fotos/show.html.erb
View File

@@ -10,7 +10,8 @@ top: 0" %>
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, @foto.datei.url, <%= link_to ff_icon('icon-circle-arrow-down').html_safe, @foto.datei.url,
:class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title,:target=>:blank, :style=>"" %> :class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title,:target=>:blank, :style=>"" %>
<!-- <div class="fb-like" data-href"<%= gallery_foto_path(@foto.gallery,@foto, {fotoid:@foto.id,theme: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>--> <!-- <div class="fb-like" data-href"<%= gallery_foto_path(@foto.gallery,@foto, {fotoid:@foto.id,theme: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>-->
<%= render_shareable :url=>gallery_foto_url(@foto.gallery,@foto, {theme: nil, locale: nil}) %> <%= render_shareable :url=>gallery_foto_url(@foto.gallery,@foto, {theme: nil, locale: nil}),:turbolinks=>true, :buttons=>[:facebook, :twitter, :google_plus] %>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
</div> </div>

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

@@ -129,8 +129,6 @@ end
<% @fotos_p.each do |f| %> <% @fotos_p.each do |f| %>
<div class="left"> <div class="left">
<div id="links"> <div id="links">
<!-- <a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery>
<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid img-rounded"}) %></a>-->
<% if (@openfotoid.to_i==f.id) %> <% if (@openfotoid.to_i==f.id) %>
<meta itemprop="image" content="<%= f.datei.resized.url %>"/> <meta itemprop="image" content="<%= f.datei.resized.url %>"/>
<% end %> <% end %>
@@ -143,7 +141,6 @@ end
<meta itemprop="sameAs" content="<%= gallery_foto_path(f.gallery, f,:params=>{:plain=>nil, :theme=>nil})%>"/> <meta itemprop="sameAs" content="<%= gallery_foto_path(f.gallery, f,:params=>{:plain=>nil, :theme=>nil})%>"/>
</a> </a>
</div> </div>
</div> </div>
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, f.datei.url, <%= link_to ff_icon('icon-circle-arrow-down').html_safe, f.datei.url,
:class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title, rel: 'tooltip' %> :class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title, rel: 'tooltip' %>
@@ -152,8 +149,9 @@ end
<p></p> <p></p>
</div> </div>
<% end %> <% end %>
<% @fotos_n.each do |f| %>
<div id="links"> <div id="links">
<% @fotos_n.each do |f| %>
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" histItem="<%= gallery_foto_path(f.gallery, f,:params=>{plain: nil, theme: nil}) %>" data-gallery></a> <a href="<%= f.datei.resized.url%>" title="<%=f.title%>" histItem="<%= gallery_foto_path(f.gallery, f,:params=>{plain: nil, theme: nil}) %>" data-gallery></a>
<% end %> <% end %>
</div> </div>
@@ -174,7 +172,7 @@ end
<% end %> <% end %>
<%= render 'layouts/pretty_toolbar' %> <%= render 'layouts/pretty_toolbar' %>
</div> </div>
</div>
<%= javascript_include_tag "blueimp-gallery-all" %> <%= javascript_include_tag "blueimp-gallery-all" %>
<script> <script>
@@ -222,4 +220,4 @@ nav.share iframe {border:0; margin-top:0; padding-top:0;} /* if using medium siz
*+html .fb-like{display:inline}/* ie7 inline block fix*/ *+html .fb-like{display:inline}/* ie7 inline block fix*/
</style> </style>
</div>