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

foto update

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-02 19:03:31 +01:00
parent 97b646ec7d
commit 1926c51836
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ 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}),:turbolinks=>true, :buttons=>[:facebook, :twitter, :google_plus] %> <%= render_shareable :url=>gallery_foto_url(@foto.gallery,@foto, {theme: nil, locale: nil}),:static_link=>true, :buttons=>[:facebook, :twitter, :google_plus] %>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
</div> </div>

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

@@ -173,51 +173,51 @@ end
<%= render 'layouts/pretty_toolbar' %> <%= render 'layouts/pretty_toolbar' %>
</div> </div>
</div> </div>
<%= javascript_include_tag "blueimp-gallery-all" %> <%= javascript_include_tag "blueimp-gallery-all" %>
<script> <script>
blueimp.Gallery.prototype.textFactory = function (obj, callback) { blueimp.Gallery.prototype.textFactory = function (obj, callback) {
var $element = $('<div>') var $element = $('<div>')
.addClass('slide-content') .addClass('slide-content')
.attr('title', obj.title) .attr('title', obj.title)
.attr('histItem',obj.getAttribute('histitem')); .attr('histItem',obj.getAttribute('histitem'));
$.get(obj.href) $.get(obj.href)
.done(function (result) { .done(function (result) {
$element.html(result); $element.html(result);
callback({ callback({
type: 'load', type: 'load',
target: $element[0] target: $element[0]
}); });
}) })
.fail(function () { .fail(function () {
callback({ callback({
type: 'error', type: 'error',
target: $element[0] target: $element[0]
}); });
}); });
return $element[0]; return $element[0];
}; };
$('#openpic').click() $('#openpic').click()
blueimp.Gallery.prototype.onslide = (function(_super) { blueimp.Gallery.prototype.onslide = (function(_super) {
return function(index) { return function(index) {
history.pushState({},"Foto",String(this.list[index].getAttribute('histitem'))); history.pushState({},"Foto",String(this.list[index].getAttribute('histitem')));
return _super.apply(this, arguments); return _super.apply(this, arguments);
}; };
})(blueimp.Gallery.prototype.onslide); })(blueimp.Gallery.prototype.onslide);
</script> </script>
<style> <style>
nav.share {display:inline-block;} /* shareable's nav tag */ nav.share {display:inline-block;} /* shareable's nav tag */
nav.share div {float:left;} nav.share div {float:left;}
nav.share iframe {border:0; margin-top:0; padding-top:0;} /* if using medium sized buttons */ nav.share iframe {border:0; margin-top:0; padding-top:0;} /* if using medium sized buttons */
#___plusone_0 {font-size: default !important;} #___plusone_0 {font-size: default !important;}
.fb_iframe_widget span { vertical-align: top; } .fb_iframe_widget span { vertical-align: top; }
.fb_edge_widget_with_comment { vertical-align: top;} .fb_edge_widget_with_comment { vertical-align: top;}
.fb-like{display:inline-block} .fb-like{display:inline-block}
* html .fb-like{display:inline}/* ie6 inline block fix*/ * html .fb-like{display:inline}/* ie6 inline block fix*/
*+html .fb-like{display:inline}/* ie7 inline block fix*/ *+html .fb-like{display:inline}/* ie7 inline block fix*/
</style> </style>