Skip to content

Commit 29ee2dc

Browse files
aaronliftonaaronlifton
committed
refactor
1 parent 324312a commit 29ee2dc

File tree

6 files changed

+238
-252
lines changed

6 files changed

+238
-252
lines changed

‎README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,6 @@ If you wish to run the web interface from the `exe` directory, you have the opti
305305
PATH_TO_QLESS_DIST/exe/qless-web -F
306306
```
307307

308-
To help develop the web UI, run `bundle exec ./utils/dev/qless-web-dev -F` in the source directory after completing the steps listed under __Contributing__. This will create some sample data to simulate a busy qless server and run a development server.
309-
310308
Job Dependencies
311309
================
312310
Let's say you have one job that depends on another, but the task definitions are
@@ -626,7 +624,6 @@ options a normal job supports. See
626624
[the source](https://github.com/seomoz/qless/blob/master/lib/qless/job.rb)
627625
for a full list.
628626

629-
630627
Contributing
631628
============
632629

@@ -654,6 +651,8 @@ bundle exec rake spec
654651

655652
To change the redis instance used in tests, put the connection information into [`./spec/redis.config.yml`](https://github.com/seomoz/qless/blob/92904532aee82aaf1078957ccadfa6fcd27ae408/spec/spec_helper.rb#L26).
656653

654+
To help develop the web UI, run `bundle exec ./utils/dev/qless-web-dev` to run the server with seed data.
655+
657656
To contribute, fork the repo, use feature branches, run the tests and open PRs.
658657

659658
Mailing List

‎lib/qless/server/static/css/docs.css

+1-38
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,6 @@ hr.soften {
106106
-moz-border-radius: 4px;
107107
border-radius: 4px;
108108
}
109-
.subnav.subnav-failed {
110-
overflow: hidden;
111-
}
112-
.subnav.full {
113-
height: auto;
114-
max-height: 50%;
115-
overflow-y: scroll;
116-
}
117109
.subnav .nav {
118110
margin-bottom: 0;
119111
}
@@ -823,33 +815,4 @@ form.well {
823815
width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */
824816
}
825817

826-
}
827-
828-
/* For proper failed job display*/
829-
.l-sidebyside {
830-
overflow:auto;
831-
}
832-
833-
.l-sidebyside > * {
834-
display:inline-block;
835-
*display: inline;
836-
*zoom: 1;
837-
}
838-
839-
.failed-job > .min-col-size {
840-
min-width: 395px;
841-
}
842-
843-
.failed-job .row {
844-
margin-left:0;
845-
margin-right:10px;
846-
height: 30px;
847-
}
848-
849-
.subnav-toggle-container {
850-
text-align: right;
851-
}
852-
853-
.subnav-toggle-container .btn {
854-
padding: 8px 10px;
855-
}
818+
}

‎lib/qless/server/static/css/resque.css

+204
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
/* @override http://localhost:4567/css/style.css */
2+
3+
/* Shamelessly poached from resque
4+
SEOmoz Blue: #4d87e2;
5+
*/
6+
7+
.queue-name {
8+
font-size: 25px;
9+
font-weight: bold;
10+
}
11+
12+
.queue-summary {
13+
font-size: 20px;
14+
}
15+
16+
.queue-summary-description {
17+
font-size: 12px;
18+
color: lightgrey;
19+
}
20+
21+
.queue-stats {
22+
margin-top: 10px;
23+
}
24+
25+
.queue-stats-date {}
26+
.queue-stats-failures {}
27+
.queue-stats-time {}
28+
.queue-stats-wait {}
29+
30+
.queue-stats-time-title {
31+
font-size: 20px;
32+
width: 100%;
33+
text-align: center;
34+
margin-bottom: 10px;
35+
margin-top: 10px;
36+
}
37+
38+
.queue-stats-time-summary {
39+
text-align: center;
40+
}
41+
42+
.queue-stats-time-histogram-wait {}
43+
.queue-stats-time-histogram-run {}
44+
45+
.job-id {
46+
float: left;
47+
font-size: 20px;
48+
font-weight: bold;
49+
padding-bottom: 10px;
50+
}
51+
52+
.job-priority {
53+
font-size: 16px;
54+
padding-left: 5px;
55+
}
56+
57+
.button {
58+
background-color: darkgray;
59+
float: left;
60+
-webkit-border-radius: 5px;
61+
-moz-border-radius: 5px;
62+
border-radius: 5px;
63+
color: white;
64+
font-weight: bold;
65+
padding-top: 2px;
66+
padding-left: 7px;
67+
padding-right: 7px;
68+
padding-bottom: 3px;
69+
margin-left: 5px;
70+
71+
}
72+
73+
.cancel-button {
74+
background-color: red;
75+
}
76+
77+
.job-tags {
78+
clear: both;
79+
margin-left: 15px;
80+
}
81+
82+
.job-tag {
83+
border: none;
84+
-webkit-border-radius: 15px;
85+
-moz-border-radius: 15px;
86+
border-radius: 15px;
87+
padding-left: 10px;
88+
padding-right: 10px;
89+
}
90+
91+
.job-summary-container > .job-tags {
92+
float: left;
93+
clear: none;
94+
margin-top: 1px;
95+
}
96+
97+
.job-summary-container > .job-summary {
98+
float: left;
99+
clear: none;
100+
margin-top: -7px;
101+
padding-left: 12px;
102+
}
103+
104+
.job-summary {
105+
clear: both;
106+
padding-top: 10px;
107+
font-size: 16px;
108+
}
109+
110+
.job-state, .job-queue, .job-worker {
111+
font-weight: bold;
112+
}
113+
114+
.job-data-container {
115+
margin-top: 10px;
116+
border: 2px solid black;
117+
}
118+
119+
html { background:#efefef; font-family:Arial, Verdana, sans-serif; font-size:13px; }
120+
body { padding:0; margin:0; }
121+
122+
.header { background:#000; padding:8px 5% 0 5%; border-bottom:1px solid #444;border-bottom:5px solid #4d87e2;}
123+
.header h1 { color:#333; font-size:90%; font-weight:bold; margin-bottom:6px;}
124+
.header ul li { display:inline;}
125+
.header ul li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; padding:8px; -webkit-border-top-right-radius:6px; -webkit-border-top-left-radius:6px; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; }
126+
.header ul li a:hover { background:#333;}
127+
.header ul li.current a { background:#ce1212; font-weight:bold; color:#fff;}
128+
129+
.header .namespace { position: absolute; right: 75px; top: 10px; color: #7A7A7A; }
130+
131+
.subnav { padding:2px 5% 7px 5%; background:#ce1212; font-size:90%;}
132+
.subnav li { display:inline;}
133+
.subnav li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; background:#dd5b5b; padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
134+
.subnav li.current a { background:#fff; font-weight:bold; color:#ce1212;}
135+
.subnav li a:active { background:#b00909;}
136+
137+
#main { padding:10px 5%; background:#fff; overflow:hidden; }
138+
#main .logo { float:right; margin:10px;}
139+
#main span.hl { background:#efefef; padding:2px;}
140+
#main h1 { margin:10px 0; font-size:190%; font-weight:bold; color:#ce1212;}
141+
#main h2 { margin:10px 0; font-size:130%;}
142+
#main table { width:100%; margin:10px 0;}
143+
#main table tr td, #main table tr th { border:1px solid #ccc; padding:6px;}
144+
#main table tr th { background:#efefef; color:#888; font-size:80%; font-weight:bold;}
145+
#main table tr td.no-data { text-align:center; padding:40px 0; color:#999; font-style:italic; font-size:130%;}
146+
#main a { color:#111;}
147+
#main p { margin:5px 0;}
148+
#main p.intro { margin-bottom:15px; font-size:85%; color:#999; margin-top:0; line-height:1.3;}
149+
#main h1.wi { margin-bottom:5px;}
150+
#main p.sub { font-size:95%; color:#999;}
151+
152+
#main table.queues { width:40%;}
153+
#main table.queues td.queue { font-weight:bold; width:50%;}
154+
#main table.queues tr.failed td { border-top:2px solid; font-size:90%; }
155+
#main table.queues tr.failure td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
156+
#main table.queues tr.failure td a{ color:#d37474;}
157+
158+
#main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
159+
#main table.jobs td.args{ width:50%;}
160+
161+
#main table.workers td.icon {width:1%; background:#efefef;text-align:center;}
162+
#main table.workers td.icon img { height: 16px; width: 16px; }
163+
#main table.workers td.where { width:25%;}
164+
#main table.workers td.queues { width:35%;}
165+
#main .queue-tag { background:#b1d2e9; padding:2px; margin:0 3px; font-size:80%; text-decoration:none; text-transform:uppercase; font-weight:bold; color:#3274a2; -webkit-border-radius:4px; -moz-border-radius:4px;}
166+
#main table.workers td.queues.queue { width:10%;}
167+
#main table.workers td.process { width:35%;}
168+
#main table.workers td.process span.waiting { color:#999; font-size:90%;}
169+
#main table.workers td.process small { font-size:80%; margin-left:5px;}
170+
#main table.workers td.process code { font-family:Monaco, "Courier New", monospace; font-size:90%;}
171+
#main table.workers td.process small a { color:#999;}
172+
#main.polling table.workers tr.working td { background:#f4ffe4; color:#7ac312;}
173+
#main.polling table.workers tr.working td.where a { color:#7ac312;}
174+
#main.polling table.workers tr.working td.process code { font-weight:bold;}
175+
176+
177+
#main table.stats th { font-size:100%; width:40%; color:#000;}
178+
#main hr { border:0; border-top:5px solid #efefef; margin:15px 0;}
179+
180+
#footer { padding:10px 5%; background:#efefef; color:#999; font-size:85%; line-height:1.5; border-top:5px solid #ccc; padding-top:10px;}
181+
#footer p a { color:#999;}
182+
183+
#main p.poll { background:url(poll.png) no-repeat 0 2px; padding:3px 0; padding-left:23px; float:right; font-size:85%; }
184+
185+
#main ul.failed {}
186+
#main ul.failed li {background:-webkit-gradient(linear, left top, left bottom, from(#efefef), to(#fff)) #efefef; margin-top:10px; padding:10px; overflow:hidden; -webkit-border-radius:5px; border:1px solid #ccc; }
187+
#main ul.failed li dl dt {font-size:80%; color:#999; width:60px; float:left; padding-top:1px; text-align:right;}
188+
#main ul.failed li dl dd {margin-bottom:10px; margin-left:70px;}
189+
#main ul.failed li dl dd .retried { float:right; text-align: right; }
190+
#main ul.failed li dl dd .retried .remove { display:none; margin-top: 8px; }
191+
#main ul.failed li.hover dl dd .retried .remove { display:block; }
192+
#main ul.failed li dl dd .controls { display:none; float:right; }
193+
#main ul.failed li.hover dl dd .controls { display:block; }
194+
#main ul.failed li dl dd code, #main ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre-wrap;}
195+
#main ul.failed li dl dd.error a {font-family:Monaco, "Courier New", monospace; font-size:90%; }
196+
#main ul.failed li dl dd.error pre { margin-top:3px; line-height:1.3;}
197+
198+
#main p.pagination { background:#efefef; padding:10px; overflow:hidden;}
199+
#main p.pagination a.less { float:left;}
200+
#main p.pagination a.more { float:right;}
201+
202+
#main form {float:right; margin-top:-10px;margin-left:10px;}
203+
204+
#main .time a.toggle_format {text-decoration:none;}

0 commit comments

Comments
 (0)