suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #449 from travis-ci/enterprise-ui-fixes

Browse Source 
Enterprise ui fixes
This commit is contained in:
Lisa P 2016-02-04 12:29:57 +01:00
commit 4347c1efe4
7 changed files with 104 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/routes/home-pro.js
View File

@ -1,4 +1,5 @@
import TravisRoute from 'travis/routes/basic'; import TravisRoute from 'travis/routes/basic';
import config from 'travis/config/environment';
export default TravisRoute.extend({ export default TravisRoute.extend({
needsAuth: false needsAuth: false

43
app/templates/account.hbs
View File

@ -1,26 +1,19 @@
{{#if allHooks.isLoaded}} {{#if allHooks.isLoaded}}
<header> <header>
{{#if config.billingEndpoint}}
{{#if config.billingEndpoint}} <div class="cta-btn">
<div class="cta-btn"> {{#if subscribeButtonInfo.subscribed}}
{{#if subscribeButtonInfo.subscribed}} <a class="btn btn-activated" href={{billingUrl}}>Subscription active!</a>
<a class="btn btn-activated" href={{billingUrl}}> {{else}}
Subscription active! {{#if subscribeButtonInfo.education}}
</a> <a class="btn btn-activated" href={{billingUrl}}>Educational account!</a>
{{else}} {{else}}
{{#if subscribeButtonInfo.education}} <a class="btn btn-activate" href={{billingUrl}}> Sign up this account!</a>
<a class="btn btn-activated" href={{billingUrl}}> {{/if}}
Educational account! {{/if}}
</a> </div>
{{else}}
<a class="btn btn-activate" href={{billingUrl}}>
Sign up this account!
</a>
{{/if}}
{{/if}} {{/if}}
</div>
{{/if}}
<div class="profile-header"> <div class="profile-header">
<h1>{{accountName}}</h1> <h1>{{accountName}}</h1>
@ -29,15 +22,17 @@
{{sync-button user=auth.currentUser}} {{sync-button user=auth.currentUser}}
{{#if user.isSyncing}} {{#if user.isSyncing}}
{{#if config.pro}} {{#unless config.enterprise}}
<p>We're only showing your private repositories. You can find your public projects on <a href="https://travis-ci.org" title="travis-ci.org">travis-ci.org</a>.</p> {{#if config.pro}}
<p>We're only showing your private repositories. You can find your public projects on <a href="https://travis-ci.org" title="travis-ci.org">travis-ci.org</a>.</p>
{{else}} {{else}}
<p>We're only showing your public repositories. You can find your private projects on <a href="https://travis-ci.com" title="travis-ci.com">travis-ci.com</a>.</p> <p>We're only showing your public repositories. You can find your private projects on <a href="https://travis-ci.com" title="travis-ci.com">travis-ci.com</a>.</p>
{{/if}} {{/if}}
{{/unless}}
{{/if}} {{/if}}
</header> </header>
<section class="profile-getstarted"> <section class="profile-getstarted">
{{!-- <a href="#" class="dismiss"><span class="icon icon--dismiss-grey"></span></a> --}} {{!-- <a href="#" class="dismiss"><span class="icon icon--dismiss-grey"></span></a> --}}
<ol class="row"> <ol class="row">

36
app/templates/components/log-content.hbs
View File

@ -2,27 +2,29 @@
<section id="log-container" class="log"> <section id="log-container" class="log">
{{#if auth.signedIn}} {{#unless config.enterprise}}
{{#if job.isLegacyInfrastructure}} {{#if auth.signedIn}}
{{#if job.isFinished}} {{#if job.isLegacyInfrastructure}}
<p class="notice"><span class="icon-flag"></span> {{#if job.isFinished}}
<span class="label-align">This job ran on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a>.</span></p> <p class="notice"><span class="icon-flag"></span>
{{else}} <span class="label-align">This job ran on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a>.</span></p>
<p class="notice"><span class="icon-flag"></span> {{else}}
<span class="label-align">This job is running on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a>.</span></p> <p class="notice"><span class="icon-flag"></span>
<span class="label-align">This job is running on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade" title="Migrating from legacy">our docs on how to upgrade</a>.</span></p>
{{/if}}
{{/if}} {{/if}}
{{/if}}
{{#if job.displayGceNotice}} {{#if job.displayGceNotice}}
{{#if job.isFinished}} {{#if job.isFinished}}
<p class="notice--blue"><span class="icon-flag"></span> <p class="notice--blue"><span class="icon-flag"></span>
<span class="label-align">This job ran on our new platform for Precise builds. Please read <a href="https://blog.travis-ci.com/2015-11-27-moving-to-a-more-elastic-future" title="Blog post on infrastructure migration">our blog post for more information</a>.</span></p> <span class="label-align">This job ran on our new platform for Precise builds. Please read <a href="https://blog.travis-ci.com/2015-11-27-moving-to-a-more-elastic-future" title="Blog post on infrastructure migration">our blog post for more information</a>.</span></p>
{{else}} {{else}}
<p class="notice--blue"><span class="icon-flag"></span> <p class="notice--blue"><span class="icon-flag"></span>
<span class="label-align">This job is running on our new platform for Legacy Precise builds. Please read <a href="https://blog.travis-ci.com/2015-11-27-moving-to-a-more-elastic-future" title="Blog post on infrastructure migration">our blog post for more information</a>.</span></p> <span class="label-align">This job is running on our new platform for Legacy Precise builds. Please read <a href="https://blog.travis-ci.com/2015-11-27-moving-to-a-more-elastic-future" title="Blog post on infrastructure migration">our blog post for more information</a>.</span></p>
{{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/unless}}
{{#if job.notStarted}} {{#if job.notStarted}}
<div class="log-notice">Hang tight, the log cannot be shown until the build has started.</div> <div class="log-notice">Hang tight, the log cannot be shown until the build has started.</div>

46
app/templates/footer.hbs
View File

@ -3,32 +3,40 @@
<div class="footer-elem"> <div class="footer-elem">
<img src="/images/ui/footer-logo.svg"> <img src="/images/ui/footer-logo.svg">
</div> </div>
<div class="footer-elem">
<h3>&copy;Travis CI, GmbH</h3> {{#unless config.enterprise}}
<p>Rigaer Straße 8<br>10247 Berlin, Germany <br> <div class="footer-elem">
<a href="https://docs.travis-ci.com/imprint.html">Imprint</a></p> <h3>&copy;Travis CI, GmbH</h3>
</div> <p>Rigaer Straße 8<br>10247 Berlin, Germany <br>
<a href="https://docs.travis-ci.com/imprint.html">Imprint</a></p>
</div>
{{/unless}}
<div class="footer-elem"> <div class="footer-elem">
<h3>Help</h3> <h3>Help</h3>
<ul> <ul>
<li><a href="https://docs.travis-ci.com">Documentation</a></li> <li><a href="https://docs.travis-ci.com">Documentation</a></li>
<li><a href="https://blog.travis-ci.com/">Blog</a></li> {{#unless config.enterprise}}
<li><a href="mailto:support@travis-ci.com">Email</a></li> <li><a href="https://blog.travis-ci.com/">Blog</a></li>
<li><a href="https://twitter.com/travisci">Twitter</a></li> <li><a href="mailto:support@travis-ci.com">Email</a></li>
<li><a href="https://twitter.com/travisci">Twitter</a></li>
{{/unless}}
</ul> </ul>
</div> </div>
{{#if config.pro}} {{#unless config.enterprise}}
{{#if config.pro}}
<div class="footer-elem">
<h3>Legal</h3>
<ul>
<li><a href="https://docs.travis-ci.com/imprint.html">Imprint</a></li>
<li><a href="https://billing.travis-ci.com/pages/terms">Terms of Service</a></li>
<li><a href="https://billing.travis-ci.com/pages/security">Security Statement</a></li>
</ul>
</div>
{{/if}}
<div class="footer-elem"> <div class="footer-elem">
<h3>Legal</h3> {{travis-status}}
<ul>
<li><a href="https://docs.travis-ci.com/imprint.html">Imprint</a></li>
<li><a href="https://billing.travis-ci.com/pages/terms">Terms of Service</a></li>
<li><a href="https://billing.travis-ci.com/pages/security">Security Statement</a></li>
</ul>
</div> </div>
{{/if}} {{/unless}}
<div class="footer-elem">
{{travis-status}}
</div>
</div> </div>
</footer> </footer>

59
app/templates/top.hbs
View File

@ -5,32 +5,36 @@
<button type="button" id="tofuburger" class="tofuburger" {{action 'toggleBurgerMenu'}}>Toggle Menu</button> <button type="button" id="tofuburger" class="tofuburger" {{action 'toggleBurgerMenu'}}>Toggle Menu</button>
</div> </div>
{{#if auth.signedIn}} {{#unless config.enterprise}}
{{#if auth.signedIn}}
{{broadcast-tower toggleBroadcasts="toggleBroadcasts" status=broadcasts.lastBroadcastStatus}} {{broadcast-tower toggleBroadcasts="toggleBroadcasts" status=broadcasts.lastBroadcastStatus}}
<ul class="broadcasts {{if showBroadcasts 'is-open'}}"> <ul class="broadcasts {{if showBroadcasts 'is-open'}}">
{{#each broadcasts.content as |broadcast|}} {{#each broadcasts.content as |broadcast|}}
<li><p><span class="broadcast-status {{broadcast.category}}" title="Transmitted on {{broadcast.updated_at}}"></span> {{{broadcast.message}}} <a {{action 'markBroadcastAsSeen' broadcast}} class="icon-close"></a></p></li> <li><p><span class="broadcast-status {{broadcast.category}}" title="Transmitted on {{broadcast.updated_at}}"></span> {{{broadcast.message}}} <a {{action 'markBroadcastAsSeen' broadcast}} class="icon-close"></a></p></li>
{{else}} {{else}}
<li><p>There are no broadcasts transmitted</p></li> <li><p>There are no broadcasts transmitted</p></li>
{{/each}} {{/each}}
</ul> </ul>
{{/if}} {{/if}}
{{/unless}}
<nav id="navigation" class="navigation {{if is-open 'is-open'}}"> <nav id="navigation" class="navigation {{if is-open 'is-open'}}">
<ul> <ul>
{{#unless config.pro}}
<li><a href="https://blog.travis-ci.com" title="Travis CI Blog" class="navigation-anchor">Blog</a></li> {{#unless config.enterprise}}
<li><a href="https://www.traviscistatus.com/" title="Travis CI Status" class="navigation-anchor">Status</a></li> {{#unless config.pro}}
<li> <li><a href="https://blog.travis-ci.com" title="Travis CI Blog" class="navigation-anchor">Blog</a></li>
<span class="navigation-anchor">Help</span> <li><a href="https://www.traviscistatus.com/" title="Travis CI Status" class="navigation-anchor">Status</a></li>
<ul class="navigation-nested"> <li>
<li><a href="https://docs.travis-ci.com">Docs</a></li> <span class="navigation-anchor">Help</span>
<li><a href="https://docs.travis-ci.com/imprint.html" alt="Imprint">Imprint</a></li> <ul class="navigation-nested">
</ul> <li><a href="https://docs.travis-ci.com">Docs</a></li>
</li> <li><a href="https://docs.travis-ci.com/imprint.html" alt="Imprint">Imprint</a></li>
{{/unless}} </ul>
</li>
{{/unless}}
{{#if config.pro}} {{#if config.pro}}
{{#unless auth.signedIn}} {{#unless auth.signedIn}}
@ -50,6 +54,11 @@
</li> </li>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
{{else}}
{{#if auth.signedIn}}
<li><a class="navigation-anchor" title="Documentation" href="https://docs.travis-ci.com">Docs</a></li>
{{/if}}
{{/unless}}
<li class="{{classProfile}}"> <li class="{{classProfile}}">
{{#if auth.signedOut}} {{#if auth.signedOut}}
@ -70,9 +79,11 @@
{{#link-to "profile" class="signed-in"}}Accounts{{/link-to}} {{#link-to "profile" class="signed-in"}}Accounts{{/link-to}}
</li> </li>
{{#if config.billingEndpoint}} {{#if config.billingEndpoint}}
<li> {{#unless config.enterprise}}
<a href={{config.billingEndpoint}}>Billing</a> <li>
</li> <a href={{config.billingEndpoint}}>Billing</a>
</li>
{{/unless}}
{{/if}} {{/if}}
<li> <li>
<a href="/" {{action "signOut" target="auth"}}>Sign Out</a> <a href="/" {{action "signOut" target="auth"}}>Sign Out</a>

4
app/utils/location.js
View File

@ -19,7 +19,7 @@ export default Ember.HistoryLocation.extend({
getURL: function() { getURL: function() {
var url; var url;
url = this._super.apply(this, arguments); url = this._super.apply(this, arguments);
if (location.pathname === '/') { if (location.pathname === '/' && !config.enterprise) {
if (this.get('auth.signedIn')) { if (this.get('auth.signedIn')) {
return '/repositories'; return '/repositories';
} else { } else {
@ -34,7 +34,7 @@ export default Ember.HistoryLocation.extend({
}, },
formatURL: function(logicalPath) { formatURL: function(logicalPath) {
if (logicalPath === '/repositories' || logicalPath === '/home' || logicalPath === '/home-pro') { if (!config.enterprise && (logicalPath === '/repositories' || logicalPath === '/home' || logicalPath === '/home-pro')) {
return '/'; return '/';
} else { } else {
return this._super(...arguments); return this._super(...arguments);

2
config/environment.js
View File

@ -37,7 +37,7 @@ module.exports = function(environment) {
}; };
if (typeof process !== 'undefined') { if (typeof process !== 'undefined') {
if (process.env.TRAVIS_PRO) { if (process.env.TRAVIS_PRO && !process.env.TRAVIS_ENTERPRISE) {
// set defaults for pro if it's used // set defaults for pro if it's used
// TODO: we have the same defaults also in ruby process, // TODO: we have the same defaults also in ruby process,
// it would be nice to move it to one place. In theory // it would be nice to move it to one place. In theory