Merge branch 'master' into dashboard-list
This commit is contained in:
Lisa Passing
commit
8f795dd4bd
|
|
@ -32,6 +32,7 @@ app.import('bower_components/JavaScript-MD5/js/md5.js');
|
|||
app.import('vendor/ansiparse.js');
|
||||
app.import('vendor/log.js');
|
||||
app.import('vendor/customerio.js');
|
||||
app.import('vendor/charmscout.js');
|
||||
app.import('bower_components/moment/moment.js');
|
||||
// Use `app.import` to add additional libraries to the generated
|
||||
// output files.
|
||||
|
|
|
|||
|
|
@ -4,9 +4,10 @@ initialize = (container, app) ->
|
|||
if config.charmKey
|
||||
window.__CHARM =
|
||||
key: config.charmKey
|
||||
url: "https://charmscout.herokuapp.com/feedback"
|
||||
url: window.location.protocol + "//charmscout.herokuapp.com/feedback"
|
||||
|
||||
$('head').append $('<script src="https://charmscout.herokuapp.com/charmeur.js?v=2" async defer></script>')
|
||||
window.bootstrapCharm()
|
||||
# $('head').append $('<script src="https://charmscout.herokuapp.com/charmeur.js?v=2" async defer></script>')
|
||||
|
||||
Initializer =
|
||||
name: 'charm'
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ Route = MainTabRoute.extend
|
|||
reposTabName: 'recent'
|
||||
|
||||
activate: ->
|
||||
@_super.apply(this, arguments)
|
||||
@store.set('isRecentTabOpen', true)
|
||||
|
||||
deactivate: ->
|
||||
@_super.apply(this, arguments)
|
||||
@store.set('isRecentTabOpen', false)
|
||||
|
||||
`export default Route`
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ $logo-red: #dc4136
|
|||
|
||||
$topbar-bg: $blue-grey
|
||||
$topbar-bg-darker: #31363d
|
||||
$topbar-height: 55px
|
||||
|
||||
$main-repo-link-color: #50555b
|
||||
$main-repo-hover-color: #607a84
|
||||
|
|
@ -17,6 +18,7 @@ $travis-lint-bg: #fafafa
|
|||
$left-bg: $light-gray
|
||||
$right-bg: $light-gray
|
||||
|
||||
|
||||
// dashboard
|
||||
$pass-color: #3FA75F
|
||||
$fail-color: #DB423C
|
||||
|
|
|
|||
|
|
@ -5,3 +5,100 @@
|
|||
.pro
|
||||
.feedback-button
|
||||
display: inline-block
|
||||
|
||||
.feedback-button
|
||||
display: inline-block
|
||||
position: fixed
|
||||
right: 1%
|
||||
left: auto
|
||||
bottom: 0
|
||||
margin: 0
|
||||
padding: .5em 1em .5em
|
||||
border-radius: 4px
|
||||
// transform: rotate(90deg) translateY(-140%)
|
||||
transform: translateY(20%)
|
||||
will-change: transform
|
||||
transition: transform ease 200ms
|
||||
background: $white
|
||||
font-size: 13px
|
||||
color: #a2afb3
|
||||
text-transform: uppercase
|
||||
box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15)
|
||||
z-index: 89
|
||||
&.hidden
|
||||
display: none
|
||||
|
||||
.feedback-button:hover
|
||||
// transform: rotate(90deg) translateY(-130%)
|
||||
transform: translateY(5%)
|
||||
|
||||
.feedback-popup
|
||||
position: fixed
|
||||
top: 50%
|
||||
left: 50%
|
||||
width: 30em
|
||||
transform: translate(-50%, -50%)
|
||||
padding: 1em 1.3em
|
||||
background-color: #ffffff
|
||||
border-radius: 5px
|
||||
z-index: 85
|
||||
box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15)
|
||||
h1
|
||||
margin: 0 0 .4em
|
||||
padding-left: .4em
|
||||
color: #347389
|
||||
font-size: 22px
|
||||
textarea
|
||||
box-sizing: border-box
|
||||
display: block
|
||||
width: 100%
|
||||
height: 10em
|
||||
margin-bottom: .8em
|
||||
padding: .5em .6em
|
||||
resize: vertical
|
||||
background-color: #f4f3eb
|
||||
font-size: 16px
|
||||
color: #7d7e80
|
||||
border: none
|
||||
font-family: $font-family-sans-serif
|
||||
.submit
|
||||
margin-right: 1em
|
||||
padding: .3em .7em
|
||||
background-color: #37a766
|
||||
color: $white
|
||||
font-size: 16px
|
||||
border: none
|
||||
border-radius: 4px
|
||||
font-family: $font-family-sans-serif
|
||||
cursor: pointer
|
||||
p
|
||||
padding-left: 0.7em
|
||||
margin: 0.3em 0 0
|
||||
a
|
||||
color: #7d7e80
|
||||
font-size: 16px
|
||||
text-decoration: none
|
||||
a:hover
|
||||
text-decoration: underline
|
||||
|
||||
.closed &
|
||||
display: none
|
||||
|
||||
.feedback-overlay
|
||||
display: block
|
||||
position: fixed
|
||||
top: 0
|
||||
right: 0
|
||||
bottom: 0
|
||||
left: 0
|
||||
width: 100%
|
||||
height: 100%
|
||||
background-color: rgba(#D5D5CE, 0.7)
|
||||
z-index: 84
|
||||
.closed &
|
||||
display: none
|
||||
|
||||
|
||||
#CHARM_FORM_TARGET
|
||||
display: none
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
#right
|
||||
display: none
|
||||
|
||||
.application:not(> .error)
|
||||
#profile, #home
|
||||
&.pro.maximized .application
|
||||
#global_slider
|
||||
position: absolute
|
||||
background-color: $color-bg-slider
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{{#if job.isLoaded}}
|
||||
<div {{bind-attr class="view.color"}}>
|
||||
<div id="new-summary">
|
||||
<div class="request-kind">
|
||||
<div {{bind-attr class=":kind-icon job.build.eventType"}}>
|
||||
<div {{bind-attr class=":request-kind job.build.eventType"}}>
|
||||
<div class="kind-icon">
|
||||
</div>
|
||||
</div>
|
||||
<div class="right">
|
||||
|
|
@ -38,12 +38,13 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="branch" {{bind-attr title="job.commit.branch"}}>
|
||||
{{job.commit.branch}}
|
||||
</div>
|
||||
|
||||
<div class="subject">
|
||||
- {{format-message job.commit.subject repoBinding=job.repo}}
|
||||
<div class="mainline">
|
||||
<div class="branch" {{bind-attr title="job.commit.branch"}}>
|
||||
{{job.commit.branch}}
|
||||
</div>
|
||||
<div class="subject">
|
||||
- {{format-message job.commit.subject repoBinding=job.repo}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<pre class="body">{{format-message job.commit.body repoBinding=job.repo pre=true}}</pre>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
},
|
||||
"repository": "",
|
||||
"engines": {
|
||||
"node": ">= 0.10.0"
|
||||
"node": "0.10.33"
|
||||
},
|
||||
"author": "",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
BIN
public/cancelled-favicon.ico
Normal file
BIN
public/cancelled-favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
public/failed-favicon.ico
Normal file
BIN
public/failed-favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 4.2 KiB |
BIN
public/passed-favicon.ico
Normal file
BIN
public/passed-favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
public/queued-favicon.ico
Normal file
BIN
public/queued-favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
140
vendor/charmscout.js
vendored
140
vendor/charmscout.js
vendored
|
|
@ -1,112 +1,33 @@
|
|||
// Copyright (c) 2010-2012 Slash7 LLC http://charmhq.com/
|
||||
// Copyright (c) 2010-2012 Thomas Fuchs http://mir.aculo.us/
|
||||
// License: https://github.com/cheerful/charmeur/blob/master/MIT-LICENSE
|
||||
(function(){
|
||||
|
||||
window.bootstrapCharm = function(){
|
||||
var tab, box, email, shown = false, sending = false, openmsg = null, callbacks = {},
|
||||
VENDORS = ['webkit','moz','o','ms'],
|
||||
STYLE =
|
||||
'.feedback-button {' +
|
||||
' display: inline-block;' +
|
||||
' position: fixed;' +
|
||||
' right: 0;' +
|
||||
' left: auto;' +
|
||||
' top: 35%;' +
|
||||
' margin: 0;' +
|
||||
' padding: 1.5em 1em .5em;' +
|
||||
' border-radius: 4px;' +
|
||||
' transform: rotate(90deg) translateY(-140%);' +
|
||||
' will-change: transform;' +
|
||||
' transition: transform ease 200ms;' +
|
||||
' background: #ffffff;' +
|
||||
' font-size: 13px;' +
|
||||
' color: #a2afb3;' +
|
||||
' text-transform: uppercase;' +
|
||||
' box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15);' +
|
||||
'}' +
|
||||
'.feedback-button:hover {' +
|
||||
' transform: rotate(90deg) translateY(-130%);' +
|
||||
'}' +
|
||||
'.feedback-popup {' +
|
||||
' position: fixed;' +
|
||||
' top: 50%;' +
|
||||
' left: 50%;' +
|
||||
' width: 30em;' +
|
||||
' transform: translate(-50%, -50%);' +
|
||||
' padding: 1em 1.3em;' +
|
||||
' background-color: #ffffff;' +
|
||||
' border-radius: 5px;' +
|
||||
' z-index: 999;'
|
||||
' box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15);' +
|
||||
' }' +
|
||||
' .feedback-popup h1 {' +
|
||||
' margin: 0 0 .4em;' +
|
||||
' padding-left: .4em;' +
|
||||
' color: #347389;' +
|
||||
' font-size: 20px;' +
|
||||
' }' +
|
||||
' .feedback-popup textarea {' +
|
||||
' box-sizing: border-box;' +
|
||||
' display: block;' +
|
||||
' width: 100%;' +
|
||||
' height: 10em;' +
|
||||
' margin-bottom: .8em;' +
|
||||
' padding: .5em .6em;' +
|
||||
' resize: vertical;' +
|
||||
' background-color: #f4f3eb;' +
|
||||
' font-size: 15px;' +
|
||||
' color: #7d7e80;' +
|
||||
' border: none;' +
|
||||
' font-family: "Source Sans Pro", Helvetica, sans-serif;' +
|
||||
' }' +
|
||||
' .feedback-popup .submit {' +
|
||||
' margin-right: 1em;' +
|
||||
' padding: .3em .7em;' +
|
||||
' background-color: #37a766;' +
|
||||
' color: #ffffff;' +
|
||||
' font-size: 15px;' +
|
||||
' border: none;' +
|
||||
' border-radius: 4px;' +
|
||||
' font-family: "Source Sans Pro", Helvetica, sans-serif;' +
|
||||
' }' +
|
||||
' .feedback-popup a {' +
|
||||
' color: #7d7e80;' +
|
||||
' font-size: 15px;' +
|
||||
' text-decoration: none;' +
|
||||
' }' +
|
||||
' .feedback-popup a:hover {' +
|
||||
' text-decoration: underline;' +
|
||||
' }',
|
||||
BOX =
|
||||
'<div class="feedback-popup">' +
|
||||
'<h1>Have feedback or questions?</h1>' +
|
||||
'<iframe id="CHARM_FORM_TARGET" name="CHARM_FORM_TARGET" src="javascript:void(0)" onload="__CHARM&&__CHARM.iFrameLoaded&&__CHARM.iFrameLoaded()" onerror="__CHARM&&__CHARM.iFrameError&&__CHARM.iFrameError()"></iframe>' +
|
||||
'<form id="CHARM_FORM" action="https://secure.charmhq.com/feedback" method="POST" accept-charset="utf-8">' +
|
||||
'<form id="CHARM_FORM" target="CHARM_FORM_TARGET" method="POST" accept-charset="utf-8">'+
|
||||
'<div id="CHARM_YOUR_EMAIL"></div>'+
|
||||
'<div id="CHARM_YOUR_COMMENT"></div>'+
|
||||
'<textarea id="CHARM_COMMENT" name="content" class="ignore-return-pressed" placeholder="Let us know and we will get right back to you by email"></textarea>' +
|
||||
'<input id="CHARM_SUBMIT" type="submit" class="submit" value="">' +
|
||||
'<a href="#" title="" id="CHARM_CANCEL"></a>' +
|
||||
'<input id="CHARM_SUBMIT" type="submit" class="submit" value="Send Feedback">' +
|
||||
'<a href="#" title="" id="CHARM_CANCEL">cancel</a>' +
|
||||
'</form>' +
|
||||
'</div>',
|
||||
'</div>' +
|
||||
'<div class="feedback-overlay"></div>',
|
||||
DEFAULTS = {
|
||||
text: '',
|
||||
submit: 'Send feedback',
|
||||
cancel: 'cancel',
|
||||
your_email: 'Your email address:',
|
||||
your_comment: 'Your message:',
|
||||
feedback_sending: 'Sending...',
|
||||
feedback_sent: 'Your feedback was sent!<br/>We will get back to you as soon as possible!',
|
||||
feedback_sending: '<p>Sending...</p>',
|
||||
feedback_sent: '<h1>Your feedback was sent!</h1><p>We will get back to you as soon as possible!</p>',
|
||||
feedback_error: 'There was a problem sending your message.<br/>Please contact support directly.<br/><br/>close this message'
|
||||
};
|
||||
|
||||
function vendored(property, value){
|
||||
var string = '';
|
||||
for(var i=0;i<VENDORS.length;i++)
|
||||
string += '-'+VENDORS[i]+'-'+property+":"+value+';';
|
||||
string += property+":"+value+';';
|
||||
return string;
|
||||
}
|
||||
|
||||
function log(s){
|
||||
'console' in window && 'log' in console && console.log(s);
|
||||
}
|
||||
|
|
@ -122,19 +43,7 @@
|
|||
}
|
||||
|
||||
function $(id){ return typeof id == 'string' ? document.getElementById(id) : id; }
|
||||
function css(id,style){ $(id).style.cssText += ';' + style; }
|
||||
|
||||
function csstag(styles){
|
||||
var css = document.createElement('style');
|
||||
css.setAttribute('type','text/css');
|
||||
if('styleSheet' in css)
|
||||
css.styleSheet.cssText = styles;
|
||||
else
|
||||
css.innerHTML = styles;
|
||||
|
||||
document.getElementsByTagName('head')[0].appendChild(css);
|
||||
}
|
||||
|
||||
|
||||
function init(){
|
||||
tab = document.createElement('a');
|
||||
tab.id = "CHARM_TAB";
|
||||
|
|
@ -143,7 +52,6 @@
|
|||
tab.href = "https://secure.charmhq.com/feedback/" + __CHARM.key;
|
||||
tab.onclick = function(){ show(); return false };
|
||||
document.body.appendChild(tab);
|
||||
csstag(STYLE);
|
||||
}
|
||||
|
||||
function template(string){
|
||||
|
|
@ -188,6 +96,7 @@
|
|||
if(!box) {
|
||||
box = document.createElement('div');
|
||||
box.id = "CHARM_BOX";
|
||||
//box.className = 'feedback-popup';
|
||||
box.innerHTML = BOX;
|
||||
document.body.appendChild(box);
|
||||
|
||||
|
|
@ -200,23 +109,23 @@
|
|||
customize('your_email');
|
||||
customize('your_comment');
|
||||
$('CHARM_YOUR_EMAIL').appendChild(email);
|
||||
box.className = 'closed' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : '');
|
||||
box.className = 'feedback-popup closed' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : '');
|
||||
} else {
|
||||
$('CHARM_YOUR_EMAIL').parentNode.removeChild($('CHARM_YOUR_EMAIL'));
|
||||
$('CHARM_YOUR_COMMENT').parentNode.removeChild($('CHARM_YOUR_COMMENT'));
|
||||
userdata('email');
|
||||
}
|
||||
|
||||
customize('text');
|
||||
customize('submit', 'value');
|
||||
customize('cancel');
|
||||
// customize('text');
|
||||
// customize('submit', 'value');
|
||||
// customize('cancel');
|
||||
|
||||
userdata('key');
|
||||
userdata('customer');
|
||||
userdata('customer_info');
|
||||
userdata('first_name');
|
||||
userdata('last_name');
|
||||
userdata('user_info');
|
||||
userdata('user_info');
|
||||
userdata('customer_id');
|
||||
userdata('subject');
|
||||
|
||||
|
|
@ -224,15 +133,12 @@
|
|||
data('user_agent', navigator.userAgent);
|
||||
data('local_time', (new Date).toString());
|
||||
|
||||
if('charm_url' in __CHARM){
|
||||
$('CHARM_FORM').action = __CHARM['charm_url'];
|
||||
}
|
||||
$('CHARM_FORM').action = __CHARM['url'];
|
||||
|
||||
setTimeout(function(){
|
||||
var scrollTop = document.body.scrollTop;
|
||||
|
||||
box.className = 'open' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : '');
|
||||
css(box, 'display:block');
|
||||
$('CHARM_FORM').onsubmit = function(){
|
||||
var ok = !($('CHARM_COMMENT').value.replace(/^\s+/, '').replace(/\s+$/, '') == "");
|
||||
if(ok){
|
||||
|
|
@ -255,7 +161,6 @@
|
|||
|
||||
return;
|
||||
}
|
||||
css(box, 'display:block');
|
||||
box.offsetLeft;
|
||||
box.className = 'open' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : '');
|
||||
if($('CHARM_EMAIL'))
|
||||
|
|
@ -297,7 +202,7 @@
|
|||
msg.id = "CHARM_MESSAGE";
|
||||
msg.innerHTML = template((id in __CHARM) ? __CHARM[id] : DEFAULTS[id]);
|
||||
document.body.appendChild(msg);
|
||||
msg.className = 'open';
|
||||
msg.className = 'feedback-popup open';
|
||||
msg.onclick = function(){ closeMessage(msg); };
|
||||
if(autoclose === undefined || !autoclose === false)
|
||||
setTimeout(function(){ closeMessage(msg); }, 4000);
|
||||
|
|
@ -316,17 +221,14 @@
|
|||
if(!shown) return;
|
||||
shown = false;
|
||||
box.className = 'closed' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : '');
|
||||
setTimeout(function(){
|
||||
css(box, 'display:none');
|
||||
}, 260);
|
||||
}
|
||||
|
||||
function hideTab(){
|
||||
tab.className = 'hidden';
|
||||
tab.classList.add('hidden');
|
||||
}
|
||||
|
||||
function showTab(){
|
||||
tab.className = '';
|
||||
tab.classList.remove('hidden');
|
||||
}
|
||||
|
||||
function after(){
|
||||
|
|
@ -341,4 +243,4 @@
|
|||
}
|
||||
|
||||
init();
|
||||
})();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -138,9 +138,10 @@ class Travis::Web::App
|
|||
end
|
||||
|
||||
def expires(file)
|
||||
case path_for(file)
|
||||
when '/' then '0'
|
||||
else (server_start + age).httpdate
|
||||
if fingerprinted?(file)
|
||||
(server_start + age).httpdate
|
||||
else
|
||||
'0'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user