Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1850)

Unified Diff: appengine/swarming/ui/res/imp/common/swarming-app.html

Issue 2511463003: Move error-toast up and make server details problems easy to see (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/swarming/ui/res/imp/common/swarming-app.html
diff --git a/appengine/swarming/ui/res/imp/common/swarming-app.html b/appengine/swarming/ui/res/imp/common/swarming-app.html
index b9988b6271773a2bb7bd05196f27a77929a1cff1..2bf693a9026bcf35bffb638947aa198032cccf5e 100644
--- a/appengine/swarming/ui/res/imp/common/swarming-app.html
+++ b/appengine/swarming/ui/res/imp/common/swarming-app.html
@@ -51,6 +51,7 @@
<link rel="import" href="auth-signin.html">
<link rel="import" href="common-behavior.html">
+<link rel="import" href="error-toast.html">
<dom-module id="swarming-app">
<template>
@@ -68,6 +69,11 @@
color: #fff;
}
+ app-toolbar.error {
+ background-color: #b41f1f;
+ color: #fff;
+ }
+
app-toolbar a {
color: #fff;
}
@@ -129,7 +135,7 @@
<div class="menu-item"><a class="left" href="/oldui">Old UI</a></div>
</app-drawer>
<app-header fixed>
- <app-toolbar>
+ <app-toolbar class$="[[_toolbarClass(client_id)]]">
<paper-icon-button
class="menu-button"
icon="icons:menu"
@@ -143,28 +149,33 @@
<a class="left" href="/botlist" hidden$="[[!wide_layout]]">Bot List</a>
<a class="left" href="/tasklist" hidden$="[[!wide_layout]]">Task List</a>
<div class="flex" hidden$="[[!wide_layout]]"></div>
- <a class="small right" href="/oldui" hidden$="[[!wide_layout]]">Old UI</a>
- <div class="small right">
- Server:
- <a href$="[[_versionLink(server_details)]]">
- [[server_details.server_version]]
- </a>
- </div>
- <auth-signin
- class="right"
- client_id="[[client_id]]"
- auth_headers="{{auth_headers}}"
- profile="{{profile}}"
- signed_in="{{signed_in}}">
- </auth-signin>
+ <template is="dom-if" if="[[client_id]]">
+ <div class="small right">
+ Server:
+ <a href$="[[_versionLink(server_details)]]">
+ [[server_details.server_version]]
+ </a>
+ </div>
+ <auth-signin
+ class="right"
+ client_id="[[client_id]]"
+ auth_headers="{{auth_headers}}"
+ profile="{{profile}}"
+ signed_in="{{signed_in}}">
+ </auth-signin>
+ </template>
+ <template is="dom-if" if="[[!client_id]]">
+ <div class="right">No OAauth client id found.</div>
+ </template>
</app-toolbar>
</app-header>
<div class="main-content">
<content></content>
</div>
- <a target="_blank" rel="noopener" href="https://bugs.chromium.org/p/chromium/issues/entry?components=Infra%3EPlatform%3ESwarming&owner=kjlubick@chromium.org&status=Assigned">
- <paper-fab mini icon="icons:bug-report"></paper-fab>
- </a>
+ <error-toast></error-toast>
+ <a target="_blank" rel="noopener" href="https://bugs.chromium.org/p/chromium/issues/entry?components=Infra%3EPlatform%3ESwarming&owner=kjlubick@chromium.org&status=Assigned">
+ <paper-fab mini icon="icons:bug-report"></paper-fab>
+ </a>
</app-header-layout>
<iron-media-query query="min-width: 600px" query-matches="{{wide_layout}}"></iron-media-query>
@@ -236,13 +247,22 @@
this._getJsonAsync("permissions", "/api/swarming/v1/server/permissions",
"_busy1", this.auth_headers);
this._getJsonAsync("server_details", "/api/swarming/v1/server/details",
- "_busy2", this.auth_headers)
+ "_busy2", this.auth_headers).catch(function(r){
+ sk.errorMessage("Http response: "+ (r.status || " ") + " " + r.response);
+ });
},
_toggleMobileMenu: function() {
this.$.mobile_menu.toggle();
},
+ _toolbarClass: function(client_id) {
+ if (!client_id) {
+ return "error";
+ }
+ return "";
+ },
+
_versionLink: function(version) {
if (!version || !version.server_version) {
return undefined;
« no previous file with comments | « appengine/swarming/ui/res/imp/botpage/bot-page.html ('k') | appengine/swarming/ui/res/imp/index/swarming-index-demo.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698