jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Merge randuin's changes

Browse Source 
* Revert user/show changes
* Move paginator js into separate file
This commit is contained in:
albert
2011-09-06 11:01:40 -04:00
parent c37766c4c1
commit 33fa8d30ee
5 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/application.js
View File

@@ -8,20 +8,3 @@
//= require_self
//= require_tree .
(function() {
Danbooru.Paginator = {};
Danbooru.Paginator.next_page = function() {
if($('.paginator li span').parent().next().length != 0)
{
window.location = $('.paginator li span').parent().next().find('a').attr('href');
}
}
Danbooru.Paginator.prev_page = function() {
if($('.paginator li span').parent().prev().length != 0)
{
window.location = $('.paginator li span').parent().prev().find('a').attr('href');
console.log('logged')
}
}
})();

22
app/assets/javascripts/paginator.js Normal file
View File

@@ -0,0 +1,22 @@
(function() {
Danbooru.Paginator = {};
Danbooru.Paginator.next_page = function() {
if($('.paginator li span').parent().next().length != 0)
{
window.location = $('.paginator li span').parent().next().find('a').attr('href');
}
}
Danbooru.Paginator.prev_page = function() {
if($('.paginator li span').parent().prev().length != 0)
{
window.location = $('.paginator li span').parent().prev().find('a').attr('href');
console.log('logged')
}
}
})();
$(document).ready(function() {
key('right', function(){ Danbooru.Paginator.next_page() });
key('left', function(){ Danbooru.Paginator.prev_page() });
})

2
app/assets/javascripts/posts.js
View File

@@ -111,6 +111,4 @@
$(document).ready(function() {
Danbooru.Post.initialize_all();
key('right', function(){ Danbooru.Paginator.next_page() });
key('left', function(){ Danbooru.Paginator.prev_page() });
});

3
app/assets/stylesheets/users.css.scss
View File

@@ -1,3 +0,0 @@
small { font-size: 80% }
dt { float: left; margin: 0 20px 0 0; width: 200px; }
dd { margin: 0 }

12
app/views/users/show.html.erb
View File

@@ -1,9 +1,17 @@
<div id="c-users">
<div id="a-show">
<h1><%= CurrentUser.pretty_name %> <small>[<%= @presenter.level %>]</small></h1>
<div><small>Member since <strong><%= @presenter.join_date %></strong> with the help of <strong><%= @presenter.inviter(self) %></strong></small></div>
<h1>Show User: <%= CurrentUser.pretty_name %></h1>
<dl>
<dt>Join Date</dt>
<dd><%= @presenter.join_date %></dd>
<dt>Inviter</dt>
<dd><%= @presenter.inviter(self) %></dd>
<dt>Level</dt>
<dd><%= @presenter.level %></dd>
<dt>Upload Limit</dt>
<dd><%= @presenter.upload_limit %></dd>