sidetiq 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/lib/sidetiq/version.rb +1 -1
  4. data/lib/sidetiq/views/_home_nav.erb +11 -15
  5. data/lib/sidetiq/views/_worker_nav.erb +15 -21
  6. data/lib/sidetiq/views/assets/styles.css +0 -36
  7. data/lib/sidetiq/views/history.erb +4 -4
  8. data/lib/sidetiq/views/locks.erb +4 -4
  9. data/lib/sidetiq/views/schedule.erb +4 -4
  10. data/lib/sidetiq/views/sidetiq.erb +4 -4
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3baafa1fdc03a9ebae36e49a19cc51c4480ff400
4
- data.tar.gz: 96e849289c2324d0942014256e3ff2de5748dd64
3
+ metadata.gz: ef77874172fe6f9ad6b577266ff0e7fe73644d44
4
+ data.tar.gz: a5b99636f9ac197725e1394d562d3d8caa19af56
5
5
  SHA512:
6
- metadata.gz: 57d0a387e531eb91be1bb19266e4e2a9fd2e84e9da0658d5d7c955bb977ef548385b72db30201f3f07956796017f3e1d705ac91a14e0363c8b4899f5e860fb93
7
- data.tar.gz: 5e56ab0f15722182c346c5e97a4c6d4211522a634e61bcd281aeaa146b35c2d3873ff8ef7ee13bd37c572608954cd8beb182a02e3dfef2f2f600e97b5ad94595
6
+ metadata.gz: f7710c8ca9a95dec02c31edace09241d826e15ded33dfc0c7dda5bfa4b5e7fc1d198bb4ad6f3599db114cc1243f60e8c8de8ab8759fa319dc37b079c8a3baa77
7
+ data.tar.gz: 6661bb21dff46d626be00e099dd5a7a91c820a34394dcb93e208cc4f0c24bcbf654e167c599b98b0238c425152757cf52a686e487e9b41ed27534add71634a48
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ 0.4.2
2
+ -----
3
+
4
+ - Fix styling for Bootstrap 3 [manuelmeurer]
5
+
1
6
  0.4.1
2
7
  -----
3
8
 
data/lib/sidetiq/version.rb CHANGED
@@ -8,7 +8,7 @@ module Sidetiq
8
8
  MINOR = 4
9
9
 
10
10
  # Public: Sidetiq patch level.
11
- PATCH = 1
11
+ PATCH = 2
12
12
 
13
13
  # Public: Sidetiq version suffix.
14
14
  SUFFIX = nil
data/lib/sidetiq/views/_home_nav.erb CHANGED
@@ -1,16 +1,12 @@
1
- <div class="span3">
2
- <ul class="nav nav-list sidetiq-sidenav">
3
- <li>
4
- <a href="<%= " #{root_path}sidetiq" %>">
5
- <i class="icon-chevron-right"></i>
6
- Home
7
- </a>
8
- </li>
9
- <li>
10
- <a href="<%= "#{root_path}sidetiq/locks" %>">
11
- <i class="icon-chevron-right"></i>
12
- Locks
13
- </a>
14
- </li>
15
- </ul>
1
+ <div class="col-md-3">
2
+ <div class="list-group sidetiq-sidenav">
3
+ <a href="<%= root_path %>sidetiq" class="list-group-item<%= current_path == 'sidetiq' ? ' active' : nil %>">
4
+ <i class="icon-chevron-right"></i>
5
+ Home
6
+ </a>
7
+ <a href="<%= root_path %>sidetiq/locks" class="list-group-item<%= current_path == 'sidetiq/locks' ? ' active' : nil %>">
8
+ <i class="icon-chevron-right"></i>
9
+ Locks
10
+ </a>
11
+ </div>
16
12
  </div>
data/lib/sidetiq/views/_worker_nav.erb CHANGED
@@ -1,22 +1,16 @@
1
- <div class="span3">
2
- <ul class="nav nav-list sidetiq-sidenav">
3
- <li>
4
- <a href="<%= "#{root_path}sidetiq" %>">
5
- <i class="icon-chevron-right"></i>
6
- Home
7
- </a>
8
- </li>
9
- <li>
10
- <a href="<%= "#{root_path}sidetiq/#{@worker.name}/schedule" %>">
11
- <i class="icon-chevron-right"></i>
12
- Job Schedule
13
- </a>
14
- </li>
15
- <li>
16
- <a href="<%= "#{root_path}sidetiq/#{@worker.name}/history" %>">
17
- <i class="icon-chevron-right"></i>
18
- Job History
19
- </a>
20
- </li>
21
- </ul>
1
+ <div class="col-md-3">
2
+ <div class="list-group sidetiq-sidenav">
3
+ <a href="<%= root_path %>sidetiq" class="list-group-item<%= current_path == 'sidetiq' ? ' active' : nil %>">
4
+ <i class="icon-chevron-right"></i>
5
+ Home
6
+ </a>
7
+ <a href="<%= root_path %>sidetiq/#{@worker.name}/schedule" class="list-group-item<%= current_path == "sidetiq/#{@worker.name}/schedule" ? ' active' : nil %>">
8
+ <i class="icon-chevron-right"></i>
9
+ Job Schedule
10
+ </a>
11
+ <a href="<%= root_path %>sidetiq/#{@worker.name}/history" class="list-group-item<%= current_path == "#{@worker.name}/history" ? ' active' : nil %>">
12
+ <i class="icon-chevron-right"></i>
13
+ Job History
14
+ </a>
15
+ </div>
22
16
  </div>
data/lib/sidetiq/views/assets/styles.css CHANGED
@@ -1,36 +0,0 @@
1
- <style>
2
- .sidetiq-container {
3
- padding-left: 0;
4
- padding-right: 0;
5
- }
6
-
7
- .sidetiq-sidenav {
8
- width: 228px;
9
- padding: 0;
10
- background-color: #fff;
11
- -webkit-border-radius: 6px;
12
- -moz-border-radius: 6px;
13
- border-radius: 6px;
14
- }
15
-
16
- .sidetiq-sidenav > li > a {
17
- display: block;
18
- width: 190px \9;
19
- margin: 0 0 -1px;
20
- padding: 8px 14px;
21
- border: 1px solid #e5e5e5;
22
- }
23
- j
24
- .sidetiq-sidenav > li:first-child > a {
25
- -webkit-border-radius: 6px 6px 0 0;
26
- -moz-border-radius: 6px 6px 0 0;
27
- border-radius: 6px 6px 0 0;
28
- }
29
-
30
- .sidetiq-sidenav > li:last-child > a {
31
- -webkit-border-radius: 0 0 6px 6px;
32
- -moz-border-radius: 0 0 6px 6px;
33
- border-radius: 0 0 6px 6px;
34
- }
35
- </style>
36
-
data/lib/sidetiq/views/history.erb CHANGED
@@ -1,16 +1,16 @@
1
1
  <%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
2
2
 
3
3
  <header class="row">
4
- <div class="span5">
4
+ <div class="col-md-5">
5
5
  <h3>Recurring Job: <%= @worker.name %></h3>
6
6
  </div>
7
7
  </header>
8
8
 
9
- <div class="container-fluid sidetiq-container">
10
- <div class="row-fluid">
9
+ <div class="container">
10
+ <div class="row">
11
11
  <%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_worker_nav.erb')) %>
12
12
 
13
- <div class="span9">
13
+ <div class="col-md-9">
14
14
  <table class="table table-striped table-bordered table-hover table-white" style="width: 100%; margin: 0; table-layout:fixed;">
15
15
  <thead>
16
16
  <th style="width: 10%">Status</th>
data/lib/sidetiq/views/locks.erb CHANGED
@@ -1,16 +1,16 @@
1
1
  <%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
2
2
 
3
3
  <header class="row">
4
- <div class="span5">
4
+ <div class="col-md-5">
5
5
  <h3>Active Locks</h3>
6
6
  </div>
7
7
  </header>
8
8
 
9
- <div class="container-fluid sidetiq-container">
10
- <div class="row-fluid">
9
+ <div class="container">
10
+ <div class="row">
11
11
  <%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_home_nav.erb')) %>
12
12
 
13
- <div class="span9">
13
+ <div class="col-md-9">
14
14
  <% if @locks.length > 0 %>
15
15
  <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
16
16
  <thead>
data/lib/sidetiq/views/schedule.erb CHANGED
@@ -1,16 +1,16 @@
1
1
  <%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
2
2
 
3
3
  <header class="row">
4
- <div class="span5">
4
+ <div class="col-md-5">
5
5
  <h3>Recurring Job: <%= @worker.name %></h3>
6
6
  </div>
7
7
  </header>
8
8
 
9
- <div class="container-fluid sidetiq-container">
10
- <div class="row-fluid">
9
+ <div class="container">
10
+ <div class="row">
11
11
  <%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_worker_nav.erb')) %>
12
12
 
13
- <div class="span9">
13
+ <div class="col-md-9">
14
14
  <% if (recurrences = @schedule.recurrence_rules).length > 0 %>
15
15
  <table class="table table-striped table-bordered table-hover table-white" style="width: 100%; margin: 0; table-layout:fixed;">
16
16
  <thead>
data/lib/sidetiq/views/sidetiq.erb CHANGED
@@ -1,16 +1,16 @@
1
1
  <%= File.read(File.join(File.dirname(__FILE__), 'views', 'assets', 'styles.css')) %>
2
2
 
3
3
  <header class="row">
4
- <div class="span5">
4
+ <div class="col-sm-5">
5
5
  <h3>Recurring Jobs</h3>
6
6
  </div>
7
7
  </header>
8
8
 
9
- <div class="container-fluid sidetiq-container">
10
- <div class="row-fluid">
9
+ <div class="container">
10
+ <div class="row">
11
11
  <%= erb File.read(File.join(File.dirname(__FILE__), 'views', '_home_nav.erb')) %>
12
12
 
13
- <div class="span9">
13
+ <div class="col-md-9">
14
14
  <% if @workers.length > 0 %>
15
15
  <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
16
16
  <thead>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sidetiq
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tobias Svensson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-01 00:00:00.000000000 Z
11
+ date: 2013-10-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sidekiq