diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9e64cd464..6b53dae4a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -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') - } - } -})(); diff --git a/app/assets/javascripts/paginator.js b/app/assets/javascripts/paginator.js new file mode 100644 index 000000000..83ce74d05 --- /dev/null +++ b/app/assets/javascripts/paginator.js @@ -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() }); +}) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 0fe4462c6..2f05527b5 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -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() }); }); diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss deleted file mode 100644 index 5835a2be4..000000000 --- a/app/assets/stylesheets/users.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -small { font-size: 80% } -dt { float: left; margin: 0 20px 0 0; width: 200px; } -dd { margin: 0 } diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 048aa7dd5..3d30e04c8 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,9 +1,17 @@
-

<%= CurrentUser.pretty_name %> [<%= @presenter.level %>]

-
Member since <%= @presenter.join_date %> with the help of <%= @presenter.inviter(self) %>
+

Show User: <%= CurrentUser.pretty_name %>

+
Join Date
+
<%= @presenter.join_date %>
+ +
Inviter
+
<%= @presenter.inviter(self) %>
+ +
Level
+
<%= @presenter.level %>
+
Upload Limit
<%= @presenter.upload_limit %>