Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge commit 'd2b00e1c5eefffcc1cfe720360cc0da36b1630cb' into inline_a…

…ssets
  • Loading branch information...
commit 82891859732e5cac49d3d43753c77cec9109daeb 2 parents 9a396ef + d2b00e1
@lachie lachie authored
View
32 assets/whereuat.css
23 additions, 9 deletions not shown
View
13 assets/whereuat.js
@@ -1,21 +1,24 @@
(function($) {
$(function() {
- var popOver, tab, stories;
+ var bar, popOver, tab, stories;
- $("body").prepend("<div id='uat-bar'><a class='wua-go' href='#'>Show me what to test</a><div class='wua-pop-over'></div></div>");
- $("head").prepend("<link href='"+window.whereuat_stylesheet_url+"' media='screen' rel='stylesheet' type='text/css'>");
+ $("body").prepend("<div id='uat-bar'><a class='wua-go' href='#'>Show me what to test</a><span class='wua-go-spinner'></span><div class='wua-pop-over'></div></div>");
- popOver = $("#uat-bar .wua-pop-over");
- tab = $("#uat-bar a.wua-go");
+ bar = $('#uat-bar');
+ goSpinner = $('.wua-go-spinner',bar).hide();
+ popOver = $(".wua-pop-over" ,bar);
+ tab = $("a.wua-go" ,bar);
tab.toggle(
function() {
if (popOver.find("ol").length > 0) {
slideOut();
} else {
+ goSpinner.show();
$.ajax({
url: '/whereuat',
success: function(response) {
+ goSpinner.fadeOut();
popOver.append(response);
stories = popOver.find("ol");
slideOut();
View
BIN  dev/images/accept.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  dev/images/btnreject.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  dev/images/pt.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  dev/images/reject.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  dev/images/uat-logo.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
20 dev/stylesheets/whereuat.css.mustache
@@ -1,5 +1,6 @@
#uat-bar {
width: auto;
+ font-size: .9em;
text-align: center;
position: absolute;
top: 30%;
@@ -26,11 +27,11 @@
font-weight: bold;
padding: .5em;
display: block;
- width: 42px;
+ width: 40px;
height: 125px;
font-size: 0.001em;
text-indent: -2000em;
- background: #212121 url({{bg_uri}}) no-repeat -4px -10px;
+ background: #212121 url({{logo_uri}}) no-repeat -4px -10px;
-moz-border-radius-bottomright: 10px;
-webkit-border-bottom-right-radius: 10px;
-moz-border-radius-topright: 10px;
@@ -99,13 +100,13 @@
display:block;
width: 25px;
height: 28px;
- background: url({{bg_uri}}) no-repeat -9px -204px;
+ background: url({{accept_uri}}) no-repeat 1px 5px;
font-size: 0.001em;
text-indent: -20000em;
}
#uat-bar .wua-pop-over li a.wua-accept:hover {
- background-position: -9px -234px;
+ background-position: 1px -24px;
}
#uat-bar .wua-pop-over li a.wua-reject {
@@ -115,13 +116,13 @@
display:block;
width: 25px;
height: 30px;
- background: url({{bg_uri}}) no-repeat -9px -136px;
+ background: url({{reject_uri}}) no-repeat 0 8px;
font-size: 0.001em;
text-indent: -20000em;
}
#uat-bar .wua-pop-over li a.wua-reject:hover {
- background-position: -9px -168px;
+ background-position: 0 -24px;
}
#uat-bar .wua-pop-over li a.wua-pivotal {
@@ -131,13 +132,13 @@
display:block;
width: 25px;
height: 30px;
- background: url({{bg_uri}}) no-repeat -9px -301px;
+ background: url({{pt_uri}}) no-repeat 0 10px;
font-size: 0.001em;
text-indent: -20000em;
}
#uat-bar .wua-pop-over li a.wua-pivotal:hover {
- background-position: -9px -333px;
+ background-position: 0 -22px;
}
@@ -147,10 +148,11 @@
display:block;
width: 60px;
height: 25px;
- background: url({{bg_uri}}) no-repeat -1px -275px;
+ background: url({{btnreject_uri}}) no-repeat 0 0;
font-size: 0.001em;
text-indent: -20000em;
border:none;
+ cursor: pointer;
}
#uat-bar .wua-go-spinner {
View
9 lib/whereuat/assets/context.rb
@@ -4,8 +4,13 @@ class Context
# bg becomes bg_uri. bg_uri yields a data uri of the image.
ImageMap = {
- :bg => 'uat-bg.png',
- :spinner => 'spinner.gif'
+ :bg => 'uat-bg.png',
+ :logo => 'uat-logo.gif',
+ :accept => 'accept.png',
+ :reject => 'reject.png',
+ :pt => 'pt.png',
+ :btnreject => 'btnreject.png',
+ :spinner => 'spinner.gif'
}
ImageMap.each do |k,v|
Please sign in to comment.
Something went wrong with that request. Please try again.