Skip to content

Commit

Permalink
Merge pull request #65 from arka-g/fix_comments
Browse files Browse the repository at this point in the history
Super shitty comments fix for now
  • Loading branch information
martikiant committed Mar 21, 2016
2 parents 8b6bd7e + df7a25f commit 67ff7b7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions app/assets/javascripts/flotr_nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ function nextPage(){
$('#info-title').text(data.title);
$('#info-tag').text(data.tag);
$("#more-rb").attr('href', '/tags/' + data.tag + '?page=1'); //this sucks
$("#link-rb").attr('href', '/images/' + data.id); //this sucks
$('img[class="bg-img"]').attr({src: data.url});
}
});
Expand Down Expand Up @@ -197,6 +198,7 @@ function prevPage(){
$('#info-title').text(data.title);
$('#info-tag').text(data.tag);
$("#more-rb").attr('href', '/tags/' + data.tag + '?page=1'); //this sucks
$("#link-rb").attr('href', '/tags/' + data.id); //this sucks
$('img[class="bg-img"]').attr({src: data.url});
}
});
Expand Down
2 changes: 2 additions & 0 deletions app/controllers/images_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ def index

@img = Hash.new
@tags.each do |tag|
@img[:id] = tag.images.first.id
@img[:url] = tag.images.first.image.url
@img[:title] = tag.images.first.title
@img[:tag] = tag.name
Expand All @@ -27,6 +28,7 @@ def tags

@img = Hash.new
@images.each do |img|
@img[:id] = img.id
@img[:url] = img.image.url
@img[:title] = img.title
@img[:tag] = params[:tag]
Expand Down

0 comments on commit 67ff7b7

Please sign in to comment.