Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ vendor/ruby
Vagrantfile
.vagrant
.idea
.dccache

# wwtd
gemfiles/.bundle
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Changelog

## 0.0.16

* Fix bugs.

## 0.0.15

* Add CHANGELOG file.
* Update version.

## 0.0.14

* Support jQuery DataTable library.
186 changes: 186 additions & 0 deletions app/assets/javascripts/resque_web/datatables.min.js

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions app/assets/javascripts/resque_web/resque_web_common.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
var ResqueWebCommon = function() {
var initPopover = function() {
$('[data-toggle="popover"]').popover();
}

return {
init: function() {
initPopover();
},
initPopover: function() {
initPopover();
}
}
}();
30 changes: 30 additions & 0 deletions app/assets/stylesheets/resque_web/datatables.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/helpers/resque_web/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ def pagination(options = {})

markup = ""
if start - per_page >= 0
markup << link_to(raw("&laquo; less"), params.permit!.merge(:start => start - per_page), :class => 'btn less')
markup << link_to(raw("&laquo; less"), url_for(params.to_unsafe_h.merge(start: start - per_page)), class: 'btn less')
end

if start + per_page <= total
markup << link_to(raw("more &raquo;"), params.permit!.merge(:start => start + per_page), :class => 'btn more')
markup << link_to(raw("more &raquo;"), url_for(params.to_unsafe_h.merge(start: start + per_page)), class: 'btn more')
end

content_tag :p, raw(markup), :class => 'pagination'
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/resque_web/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@

<footer id="footer">
<div class="container">
<p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%=Resque::Version%></p>
<p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis_id%></p>
<p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%= Resque::VERSION %></p>
<p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%= Resque.redis_id %></p>
</div>
</footer>

Expand Down
2 changes: 1 addition & 1 deletion lib/resque_web/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ResqueWeb
VERSION = "0.0.12"
VERSION = "0.0.16"
end