数据管理页面的样式修改

Web_Manager_Develope
Linda 10 years ago
parent 7073155320
commit 29637f20e8

@ -1,5 +1,5 @@
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
var BuildConfigsController: ng.IModule;
}
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
var BuildConfigsController: ng.IModule;
}

@ -1,6 +1,6 @@
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesHelpers.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
var PodController: ng.IModule;
}
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesHelpers.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
var PodController: ng.IModule;
}

@ -1,6 +1,6 @@
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesHelpers.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
var KubernetesJsonDirective: ng.IModule;
}
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesHelpers.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
var KubernetesJsonDirective: ng.IModule;
}

@ -1,9 +1,9 @@
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
class oracleModelService {
oraclecontrollers: any[];
oracleControllers: Array<any>;
findIndexOfOracleControllers(oracleControllers: Array<any>, name: string): number;
}
}
/// <reference path="../../includes.d.ts" />
/// <reference path="kubernetesPlugin.d.ts" />
declare module Kubernetes {
class oracleModelService {
oraclecontrollers: any[];
oracleControllers: Array<any>;
findIndexOfOracleControllers(oracleControllers: Array<any>, name: string): number;
}
}

@ -1,30 +1,30 @@
/// <reference path="../../includes.d.ts" />
declare module Service {
var pluginName: string;
var log: Logging.Logger;
/**
* Used to specify whether the "service" URL should be polled for services using kubernetes or kubernetes-like service discover.
* For more details see: https://github.com/hawtio/hawtio/blob/master/docs/Services.md
*/
var pollServices: boolean;
/**
* Returns true if there is a service available for the given ID or false
*/
function hasService(ServiceRegistry: any, serviceName: string): boolean;
/**
* Returns the service for the given service name (ID) or null if it cannot be found
*
* @param ServiceRegistry
* @param serviceName
* @return {null}
*/
function findService(ServiceRegistry: any, serviceName: string): any;
/**
* Returns the service link for the given service name
*
* @param ServiceRegistry
* @param serviceName
* @return {null}
*/
function serviceLink(ServiceRegistry: any, serviceName: string): string;
}
/// <reference path="../../includes.d.ts" />
declare module Service {
var pluginName: string;
var log: Logging.Logger;
/**
* Used to specify whether the "service" URL should be polled for services using kubernetes or kubernetes-like service discover.
* For more details see: https://github.com/hawtio/hawtio/blob/master/docs/Services.md
*/
var pollServices: boolean;
/**
* Returns true if there is a service available for the given ID or false
*/
function hasService(ServiceRegistry: any, serviceName: string): boolean;
/**
* Returns the service for the given service name (ID) or null if it cannot be found
*
* @param ServiceRegistry
* @param serviceName
* @return {null}
*/
function findService(ServiceRegistry: any, serviceName: string): any;
/**
* Returns the service link for the given service name
*
* @param ServiceRegistry
* @param serviceName
* @return {null}
*/
function serviceLink(ServiceRegistry: any, serviceName: string): string;
}

@ -1,19 +1,19 @@
/// <reference path="serviceHelpers.d.ts" />
/// <reference path="../../includes.d.ts" />
declare module Service {
interface SelectorMap {
[name: string]: string;
}
interface Service {
kind: string;
id: string;
portalIP: string;
selector?: SelectorMap;
port: number;
containerPort: number;
}
interface ServiceResponse {
items: Array<Service>;
}
var _module: ng.IModule;
}
/// <reference path="serviceHelpers.d.ts" />
/// <reference path="../../includes.d.ts" />
declare module Service {
interface SelectorMap {
[name: string]: string;
}
interface Service {
kind: string;
id: string;
portalIP: string;
selector?: SelectorMap;
port: number;
containerPort: number;
}
interface ServiceResponse {
items: Array<Service>;
}
var _module: ng.IModule;
}

@ -1,108 +1,108 @@
/* console specific stuff here */
body {
padding-top: 110px;
}
.pane {
top: 110px;
}
.navbar-brand > img {
height: 20px;
margin-top: -5px;
margin-bottom: -5px;
}
.navbar-persistent {
background: #f6f6f6;
border-bottom: 1px solid #cecdcd;
padding: 0;
width: 100%;
}
.navbar-persistent > li.active:before,
.navbar-persistent > li.active:hover:before {
background: #0099d3;
bottom: -1px;
content: '';
display: block;
height: 2px;
left: 20px;
position: absolute;
right: 20px;
}
.navbar-persistent > li.active > a,
.navbar-persistent > li.active > a:hover,
.navbar-persistent > li.active:hover > a {
background: transparent !important;
color: #0099d3 !important;
}
.navbar-persistent > li.active .active > a {
color: #f1f1f1;
}
.navbar-persistent > li.dropdown-submenu:hover > .dropdown-menu {
display: none;
}
.navbar-persistent > li.dropdown-submenu.open > .dropdown-menu {
display: block;
left: 20px;
margin-top: 1px;
top: 100%;
}
.navbar-persistent > li.dropdown-submenu.open > .dropdown-toggle {
color: #222222;
}
.navbar-persistent > li.dropdown-submenu.open > .dropdown-toggle:after {
border-top-color: #222222;
}
.navbar-persistent > li.dropdown-submenu > .dropdown-toggle {
padding-right: 35px !important;
}
.navbar-persistent > li.dropdown-submenu > .dropdown-toggle:after {
position: absolute;
right: 20px;
top: 10px;
}
.navbar-persistent > li:hover:before,
.navbar-persistent > li.open:before {
background: #aaaaaa;
bottom: -1px;
content: '';
display: block;
height: 2px;
left: 20px;
position: absolute;
right: 20px;
}
.navbar-persistent > li:hover > a,
.navbar-persistent > li.open > a {
color: #222222;
}
.navbar-persistent > li:hover > a:after,
.navbar-persistent > li.open > a:after {
border-top-color: #222222;
}
.navbar-persistent > li > a {
background-color: transparent;
display: block;
line-height: 1;
padding: 9px 20px !important;
}
.navbar-persistent > li > a.dropdown-toggle {
padding-right: 35px;
}
.navbar-persistent > li > a.dropdown-toggle:after {
font-size: 15px;
position: absolute;
right: 20px;
top: 9px;
}
.navbar-persistent > li > a:hover {
color: #222222 !important;
}
.navbar-persistent > li a {
color: #4d5258 !important;
}
.navbar-pf .navbar-primary > li > a {
border-bottom: 1px solid transparent;
border-top: 1px solid transparent;
position: relative;
margin: -1px 0 0;
}
/* console specific stuff here */
body {
padding-top: 110px;
}
.pane {
top: 110px;
}
.navbar-brand > img {
height: 20px;
margin-top: -5px;
margin-bottom: -5px;
}
.navbar-persistent {
background: #f6f6f6;
border-bottom: 1px solid #cecdcd;
padding: 0;
width: 100%;
}
.navbar-persistent > li.active:before,
.navbar-persistent > li.active:hover:before {
background: #0099d3;
bottom: -1px;
content: '';
display: block;
height: 2px;
left: 20px;
position: absolute;
right: 20px;
}
.navbar-persistent > li.active > a,
.navbar-persistent > li.active > a:hover,
.navbar-persistent > li.active:hover > a {
background: transparent !important;
color: #0099d3 !important;
}
.navbar-persistent > li.active .active > a {
color: #f1f1f1;
}
.navbar-persistent > li.dropdown-submenu:hover > .dropdown-menu {
display: none;
}
.navbar-persistent > li.dropdown-submenu.open > .dropdown-menu {
display: block;
left: 20px;
margin-top: 1px;
top: 100%;
}
.navbar-persistent > li.dropdown-submenu.open > .dropdown-toggle {
color: #222222;
}
.navbar-persistent > li.dropdown-submenu.open > .dropdown-toggle:after {
border-top-color: #222222;
}
.navbar-persistent > li.dropdown-submenu > .dropdown-toggle {
padding-right: 35px !important;
}
.navbar-persistent > li.dropdown-submenu > .dropdown-toggle:after {
position: absolute;
right: 20px;
top: 10px;
}
.navbar-persistent > li:hover:before,
.navbar-persistent > li.open:before {
background: #aaaaaa;
bottom: -1px;
content: '';
display: block;
height: 2px;
left: 20px;
position: absolute;
right: 20px;
}
.navbar-persistent > li:hover > a,
.navbar-persistent > li.open > a {
color: #222222;
}
.navbar-persistent > li:hover > a:after,
.navbar-persistent > li.open > a:after {
border-top-color: #222222;
}
.navbar-persistent > li > a {
background-color: transparent;
display: block;
line-height: 1;
padding: 9px 20px !important;
}
.navbar-persistent > li > a.dropdown-toggle {
padding-right: 35px;
}
.navbar-persistent > li > a.dropdown-toggle:after {
font-size: 15px;
position: absolute;
right: 20px;
top: 9px;
}
.navbar-persistent > li > a:hover {
color: #222222 !important;
}
.navbar-persistent > li a {
color: #4d5258 !important;
}
.navbar-pf .navbar-primary > li > a {
border-bottom: 1px solid transparent;
border-top: 1px solid transparent;
position: relative;
margin: -1px 0 0;
}

@ -686,6 +686,73 @@ a:hover.data_file_btn {
background: url(../img/icons2.gif) -6px 9px no-repeat;
}
.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
margin-left: 170px;
}
.nav-pf-vertical {
width: auto;
min-width: 170px;
}
.nav-pf-vertical .list-group > .list-group-item > a {
width: auto;
}
.nav-pf-vertical > .list-group > .list-group-item > a .fa,
.nav-pf-vertical > .list-group > .list-group-item > a .glyphicon,
.nav-pf-vertical > .list-group > .list-group-item > a .pficon {
line-height: 25px;
margin-right: 3px;
}
.nav-pf-vertical > .list-group > .list-group-item > a img {
max-height: 16px;
max-width: 16px;
margin-right: 10px;
}
.navbar-tab-vertical {
height: 70px;
width: 100%;
display: block;
background: #1d1d1d;
border-color: #1d1d1d;
}
.navbar-tab-horizontal {
height: 100%;
width: 100px;
display: block;
background: #1d1d1d;
border-color: #1d1d1d;
}
.gesture {
cursor: pointer;
}
.navbar-lf {
width: 200px;
min-height: 800px;
background: #1d1d1d;
position: absolute;
left: 0;
top: 0px;
}
.navbar-lf-menu {
display: block;
text-decoration: none;
}
.log-img {
width: "66";
height: "21";
alt: "logo";
}
.fl {
float: left;
}
a.logo {
display: block;
width: 130px;
padding: 20px 0 0 40px;
}
.content-margin {
margin-left: 170px;
}
/* This is for the 'Overview' page with all the rows of boxes */
.service-view-rectangle {
position: relative;
@ -1032,70 +1099,3 @@ kubernetes-container-terminal .terminal-actions {
overflow-y: auto;
overflow-x: hidden;
}
.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
margin-left: 170px;
}
.nav-pf-vertical {
width: auto;
min-width: 170px;
}
.nav-pf-vertical .list-group > .list-group-item > a {
width: auto;
}
.nav-pf-vertical > .list-group > .list-group-item > a .fa,
.nav-pf-vertical > .list-group > .list-group-item > a .glyphicon,
.nav-pf-vertical > .list-group > .list-group-item > a .pficon {
line-height: 25px;
margin-right: 3px;
}
.nav-pf-vertical > .list-group > .list-group-item > a img {
max-height: 16px;
max-width: 16px;
margin-right: 10px;
}
.navbar-tab-vertical {
height: 70px;
width: 100%;
display: block;
background: #1d1d1d;
border-color: #1d1d1d;
}
.navbar-tab-horizontal {
height: 100%;
width: 100px;
display: block;
background: #1d1d1d;
border-color: #1d1d1d;
}
.gesture {
cursor: pointer;
}
.navbar-lf {
width: 200px;
min-height: 800px;
background: #1d1d1d;
position: absolute;
left: 0;
top: 0px;
}
.navbar-lf-menu {
display: block;
text-decoration: none;
}
.log-img {
width: "66";
height: "21";
alt: "logo";
}
.fl {
float: left;
}
a.logo {
display: block;
width: 130px;
padding: 20px 0 0 40px;
}
.content-margin {
margin-left: 170px;
}

File diff suppressed because one or more lines are too long

632
dist/img/host.svg vendored

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 37 KiB

File diff suppressed because it is too large Load Diff

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 37 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

@ -1,7 +1,7 @@
window.OPENSHIFT_CONFIG = {
auth: {
oauth_authorize_uri: "{{ .Env.OAUTH_AUTHORIZE_URI }}",
oauth_client_id: "{{ .Env.OAUTH_CLIENT_ID }}",
logout_uri: "",
}
};
window.OPENSHIFT_CONFIG = {
auth: {
oauth_authorize_uri: "{{ .Env.OAUTH_AUTHORIZE_URI }}",
oauth_client_id: "{{ .Env.OAUTH_CLIENT_ID }}",
logout_uri: "",
}
};

@ -1,42 +1,42 @@
{
"name": "hawtio-kubernetes",
"version": "2.0.0",
"devDependencies": {
"bower": "^1.3.12",
"del": "^2.2.0",
"event-stream": "^3.1.7",
"gulp": "^3.8.10",
"gulp-angular-templatecache": "^1.5.0",
"gulp-concat": "^2.4.2",
"gulp-concat-filenames": "^1.0.0",
"gulp-filter": "^3.0.1",
"gulp-less": "^3.0.5",
"gulp-load-plugins": "^0.8.0",
"gulp-ng-annotate": "^1.1.0",
"gulp-notify": "^2.1.0",
"gulp-replace": "^0.5.4",
"gulp-sourcemaps": "^1.5.1",
"gulp-typescript": "^2.4.2",
"gulp-watch": "^3.0.0",
"hawtio-node-backend": "^2.0.5",
"stringify-object": "^2.0.0",
"through2": "^0.6.3",
"underscore.string": "^2.4.0",
"urijs": "^1.17.0",
"url-join": "^0.0.1",
"which": "^1.0.8",
"wiredep": "^2.2.2",
"yargs": "^3.32.0"
},
"dependencies": {
"async": "^2.0.0-rc.6",
"connect-multiparty": "^2.0.0",
"hawtio-node-backend": "^2.1.0",
"k8s": "^0.2.7",
"node-crontab": "0.0.8",
"oracledb": "^1.9.3",
"xml2js": "^0.4.16",
"xmldom": "^0.1.22",
"xpath.js": "^1.0.6"
}
}
{
"name": "hawtio-kubernetes",
"version": "2.0.0",
"devDependencies": {
"bower": "^1.3.12",
"del": "^2.2.0",
"event-stream": "^3.1.7",
"gulp": "^3.8.10",
"gulp-angular-templatecache": "^1.5.0",
"gulp-concat": "^2.4.2",
"gulp-concat-filenames": "^1.0.0",
"gulp-filter": "^3.0.1",
"gulp-less": "^3.0.5",
"gulp-load-plugins": "^0.8.0",
"gulp-ng-annotate": "^1.1.0",
"gulp-notify": "^2.1.0",
"gulp-replace": "^0.5.4",
"gulp-sourcemaps": "^1.5.1",
"gulp-typescript": "^2.4.2",
"gulp-watch": "^3.0.0",
"hawtio-node-backend": "^2.0.5",
"stringify-object": "^2.0.0",
"through2": "^0.6.3",
"underscore.string": "^2.4.0",
"urijs": "^1.17.0",
"url-join": "^0.0.1",
"which": "^1.0.8",
"wiredep": "^2.2.2",
"yargs": "^3.32.0"
},
"dependencies": {
"async": "^2.0.0-rc.6",
"connect-multiparty": "^2.0.0",
"hawtio-node-backend": "^2.1.0",
"k8s": "^0.2.7",
"node-crontab": "0.0.8",
"oracledb": "^1.9.3",
"xml2js": "^0.4.16",
"xmldom": "^0.1.22",
"xpath.js": "^1.0.6"
}
}

@ -1,51 +1,51 @@
<div ng-controller="Kubernetes.BuildConfigController">
<div class="row">
<div hawtio-breadcrumbs></div>
</div>
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="row filter-header">
<div class="col-md-12" ng-show="model.tools.length">
<span ng-show="!id">
<hawtio-filter ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
placeholder="Filter tools..."></hawtio-filter>
</span>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div ng-hide="model.fetched">
<div class="align-center">
<i class="fa fa-spinner fa-spin"></i>
</div>
</div>
<div ng-show="model.fetched">
<div ng-hide="entity.tools.length" class="align-center">
<p class="alert alert-info">There are no tools currently available.</p>
</div>
<div ng-show="entity.tools.length">
<div ng-hide="entity.tools.length" class="align-center">
<p class="alert alert-info">There are no tools currently available.</p>
</div>
<div ng-repeat="env in entity.tools | filter:filterTemplates | orderBy:'label' track by $index">
<div class="row"
title="{{env.description}}">
<div class="col-md-9">
<a href="{{env.url}}">
<h3>
<i class="{{env.iconClass}}"></i>
{{env.label}}
</h3>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-controller="Kubernetes.BuildConfigController">
<div class="row">
<div hawtio-breadcrumbs></div>
</div>
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="row filter-header">
<div class="col-md-12" ng-show="model.tools.length">
<span ng-show="!id">
<hawtio-filter ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
placeholder="Filter tools..."></hawtio-filter>
</span>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div ng-hide="model.fetched">
<div class="align-center">
<i class="fa fa-spinner fa-spin"></i>
</div>
</div>
<div ng-show="model.fetched">
<div ng-hide="entity.tools.length" class="align-center">
<p class="alert alert-info">There are no tools currently available.</p>
</div>
<div ng-show="entity.tools.length">
<div ng-hide="entity.tools.length" class="align-center">
<p class="alert alert-info">There are no tools currently available.</p>
</div>
<div ng-repeat="env in entity.tools | filter:filterTemplates | orderBy:'label' track by $index">
<div class="row"
title="{{env.description}}">
<div class="col-md-9">
<a href="{{env.url}}">
<h3>
<i class="{{env.iconClass}}"></i>
{{env.label}}
</h3>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

@ -1,87 +1,87 @@
<div class="inline-block environment-row" ng-controller="Developer.EnvironmentPanelController">
<div class="panel-group">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title inline-block">
<a href="{{env.url}}" title="namespace: {{env.namespace}}">
<!-- <i class="{{env.iconClass}}"></i>&nbsp; -->
{{env.label}}
</a>
</h2>
</div>
<div class="panel-body">
<div class="environment-deploy-block"
ng-repeat="(project, versions) in envVersions[env.namespace] | orderBy:'project' track by $index">
<div ng-repeat="(version, versionInfo) in versions.versions | orderBy:'version' track by $index">
<div ng-repeat="(rcname, rc) in versionInfo.replicationControllers">
<div class="environment-deploy-version-and-pods">
<a href="{{rc.$viewLink}}" ng-show="rc.$viewLink"
title="View the Replication Controller from project {{project}} of version {{version}}">
<i class="fa fa-cubes"></i>
{{rc.$name}}
: {{version}}
</a>
<span ng-hide="rc.$viewLink"
title="View the Replication Controller from project {{project}} of version {{version}}">
<i class="fa fa-cubes"></i>
{{rc.$name}}
: {{version}}
</span>
<span class="pull-right" ng-show="rc.$serviceLink.href">
&nbsp;
&nbsp;
&nbsp;
<a target="test-service" href="{{rc.$serviceLink.href}}" title="Open this service in a new tab">
<i class="fa fa-external-link"></i>
</a>
</span>
&nbsp;
&nbsp;
&nbsp;
<span class="pull-right">
<a ng-show="rc.$podCounters.podsLink" href="{{rc.$podCounters.podsLink}}" title="View pods">
<span ng-show="rc.$podCounters.ready"
class="badge badge-success">{{rc.$podCounters.ready}}</span>
<span ng-show="rc.$podCounters.valid"
class="badge badge-info">{{rc.$podCounters.valid}}</span>
<span ng-show="rc.$podCounters.waiting" class="badge">{{rc.$podCounters.waiting}}</span>
<span ng-show="rc.$podCounters.error"
class="badge badge-warning">{{rc.$podCounters.error}}</span>
</a>
</span>
</div>
<div class="environment-deploy-build-info">
<a href="{{rc.$buildUrl}}" target="builds" ng-show="rc.$buildUrl && rc.$buildId" class="="
title="View the build which created this Replication Controller">
<i class="fa fa-tasks"></i>
Build #{{rc.$buildId}}
</a>
&nbsp;
&nbsp;
&nbsp;
<a href="{{rc.$gitUrl}}" target="git" ng-show="rc.$gitUrl" class="pull-right"
title="{{rc.$gitCommit}}
{{rc.$gitCommitAuthor}}
{{rc.$gitCommitDate}}
{{rc.$gitCommitMessage}}">
<i class="fa fa-code-fork"></i>
Commit {{rc.$gitCommit | limitTo:7}}
</a>
<span ng-hide="rc.$gitUrl || !rc.$gitCommit" class="pull-right"
title="{{rc.$gitCommit}}
{{rc.$gitCommitAuthor}}
{{rc.$gitCommitDate}}
{{rc.$gitCommitMessage}}">
<i class="fa fa-code-fork"></i>
Commit {{rc.$gitCommit | limitTo:7}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="inline-block environment-row" ng-controller="Developer.EnvironmentPanelController">
<div class="panel-group">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title inline-block">
<a href="{{env.url}}" title="namespace: {{env.namespace}}">
<!-- <i class="{{env.iconClass}}"></i>&nbsp; -->
{{env.label}}
</a>
</h2>
</div>
<div class="panel-body">
<div class="environment-deploy-block"
ng-repeat="(project, versions) in envVersions[env.namespace] | orderBy:'project' track by $index">
<div ng-repeat="(version, versionInfo) in versions.versions | orderBy:'version' track by $index">
<div ng-repeat="(rcname, rc) in versionInfo.replicationControllers">
<div class="environment-deploy-version-and-pods">
<a href="{{rc.$viewLink}}" ng-show="rc.$viewLink"
title="View the Replication Controller from project {{project}} of version {{version}}">
<i class="fa fa-cubes"></i>
{{rc.$name}}
: {{version}}
</a>
<span ng-hide="rc.$viewLink"
title="View the Replication Controller from project {{project}} of version {{version}}">
<i class="fa fa-cubes"></i>
{{rc.$name}}
: {{version}}
</span>
<span class="pull-right" ng-show="rc.$serviceLink.href">
&nbsp;
&nbsp;
&nbsp;
<a target="test-service" href="{{rc.$serviceLink.href}}" title="Open this service in a new tab">
<i class="fa fa-external-link"></i>
</a>
</span>
&nbsp;
&nbsp;
&nbsp;
<span class="pull-right">
<a ng-show="rc.$podCounters.podsLink" href="{{rc.$podCounters.podsLink}}" title="View pods">
<span ng-show="rc.$podCounters.ready"
class="badge badge-success">{{rc.$podCounters.ready}}</span>
<span ng-show="rc.$podCounters.valid"
class="badge badge-info">{{rc.$podCounters.valid}}</span>
<span ng-show="rc.$podCounters.waiting" class="badge">{{rc.$podCounters.waiting}}</span>
<span ng-show="rc.$podCounters.error"
class="badge badge-warning">{{rc.$podCounters.error}}</span>
</a>
</span>
</div>
<div class="environment-deploy-build-info">
<a href="{{rc.$buildUrl}}" target="builds" ng-show="rc.$buildUrl && rc.$buildId" class="="
title="View the build which created this Replication Controller">
<i class="fa fa-tasks"></i>
Build #{{rc.$buildId}}
</a>
&nbsp;
&nbsp;
&nbsp;
<a href="{{rc.$gitUrl}}" target="git" ng-show="rc.$gitUrl" class="pull-right"
title="{{rc.$gitCommit}}
{{rc.$gitCommitAuthor}}
{{rc.$gitCommitDate}}
{{rc.$gitCommitMessage}}">
<i class="fa fa-code-fork"></i>
Commit {{rc.$gitCommit | limitTo:7}}
</a>
<span ng-hide="rc.$gitUrl || !rc.$gitCommit" class="pull-right"
title="{{rc.$gitCommit}}
{{rc.$gitCommitAuthor}}
{{rc.$gitCommitDate}}
{{rc.$gitCommitMessage}}">
<i class="fa fa-code-fork"></i>
Commit {{rc.$gitCommit | limitTo:7}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>

@ -1,100 +1,100 @@
<div class="project-dashboard" ng-controller="Developer.ProjectController" hawtio-card-bg>
<div hawtio-breadcrumbs></div>
<div hawtio-tabs></div>
<!--
<div class="row filter-header">
<div class="col-md-12" ng-show="model.environments.length">
<span ng-show="!id">
<hawtio-filter ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
placeholder="Filter environments..."></hawtio-filter>
</span>
</div>
</div>
-->
<div ng-hide="model.fetched">
<div class="row">
<div class="col-md-12">
<div class="align-center">
<div class="spinner spinner-lg"></div>
</div>
</div>
</div>
</div>
<div ng-show="model.fetched" style="float: none; position: static;">
<!--
<div class="row page-header-row">
<div class="col-md-12">
<h1 class="inline-block">{{id}}</h1>
</div>
</div>
-->
<!--
<div class="pull-right">
<a href="{{entity.$build.url}}" class="btn btn-default" target="browse">
<i class="{{entity.$build.iconClass}}"></i>
{{entity.$build.label}}
</a>
</div>
-->
<div class="row row-cards-pf" title="{{env.description}}">
<div class="col-md-12 environment-rows">
<div class="card-pf">
<div class="card-pf-heading">
<h2 class="card-pf-title inline-block">Environments Overview</h2>
</div>
<div class="card-pf-body">
<div ng-hide="entity.environments.length">
<div class="row">
<div class="col-md-12 align-center">
<h2>No Environment Available</h2>
<p>Environment is a logical place where deployments happen which maps to a kubernetes / openshift namespace. You will see environments here after you add a build.</p>
<a class="btn btn-primary" ng-href="{{settingsLink}}"><i class="fa fa-plus"></i> New Build</a>
</div>
</div>
</div>
<div ng-show="entity.environments.length">
<div ng-repeat="env in entity.environments | filter:filterTemplates track by $index"
class="inline-block environment-block" ng-include="'plugins/developer/html/environmentPanel.html'">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row row-cards-pf">
<div class="col-md-12">
<div class="card-pf pipeline">
<div class="card-pf-heading no-border">
<h2 class="card-pf-title inline-block">Active Pipelines</h4>
<a ng-href="{{$projectLink}}/jenkinsJob/{{jobId}}/pipelines">View All Pipelines >></a>
</div>
<div class="card-pf-body no-top-margin">
<div class="full-card-width" ng-controller="Developer.PipelinesController" ng-include="'plugins/kubernetes/html/pendingPipelines.html'"></div>
</div>
</div>
</div>
</div>
<div class="row row-cards-pf">
<div class="col-md-12">
<div class="card-pf">
<div class="card-pf-heading">
<h2 class="card-pf-title inline-block">Commits</h2>
<a ng-href="{{$projectLink}}/wiki/history//">View All Commits >></a>
</div>
<div class="card-pf-body">
<div ng-include="'plugins/wiki/html/projectCommitsPanel.html'"></div>
</div>
</div>
</div>
</div>
</div>
<div class="project-dashboard" ng-controller="Developer.ProjectController" hawtio-card-bg>
<div hawtio-breadcrumbs></div>
<div hawtio-tabs></div>
<!--
<div class="row filter-header">
<div class="col-md-12" ng-show="model.environments.length">
<span ng-show="!id">
<hawtio-filter ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
placeholder="Filter environments..."></hawtio-filter>
</span>
</div>
</div>
-->
<div ng-hide="model.fetched">
<div class="row">
<div class="col-md-12">
<div class="align-center">
<div class="spinner spinner-lg"></div>
</div>
</div>
</div>
</div>
<div ng-show="model.fetched" style="float: none; position: static;">
<!--
<div class="row page-header-row">
<div class="col-md-12">
<h1 class="inline-block">{{id}}</h1>
</div>
</div>
-->
<!--
<div class="pull-right">
<a href="{{entity.$build.url}}" class="btn btn-default" target="browse">
<i class="{{entity.$build.iconClass}}"></i>
{{entity.$build.label}}
</a>
</div>
-->
<div class="row row-cards-pf" title="{{env.description}}">
<div class="col-md-12 environment-rows">
<div class="card-pf">
<div class="card-pf-heading">
<h2 class="card-pf-title inline-block">Environments Overview</h2>
</div>
<div class="card-pf-body">
<div ng-hide="entity.environments.length">
<div class="row">
<div class="col-md-12 align-center">
<h2>No Environment Available</h2>
<p>Environment is a logical place where deployments happen which maps to a kubernetes / openshift namespace. You will see environments here after you add a build.</p>
<a class="btn btn-primary" ng-href="{{settingsLink}}"><i class="fa fa-plus"></i> New Build</a>
</div>
</div>
</div>
<div ng-show="entity.environments.length">
<div ng-repeat="env in entity.environments | filter:filterTemplates track by $index"
class="inline-block environment-block" ng-include="'plugins/developer/html/environmentPanel.html'">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row row-cards-pf">
<div class="col-md-12">
<div class="card-pf pipeline">
<div class="card-pf-heading no-border">
<h2 class="card-pf-title inline-block">Active Pipelines</h4>
<a ng-href="{{$projectLink}}/jenkinsJob/{{jobId}}/pipelines">View All Pipelines >></a>
</div>
<div class="card-pf-body no-top-margin">
<div class="full-card-width" ng-controller="Developer.PipelinesController" ng-include="'plugins/kubernetes/html/pendingPipelines.html'"></div>
</div>
</div>
</div>
</div>
<div class="row row-cards-pf">
<div class="col-md-12">
<div class="card-pf">
<div class="card-pf-heading">
<h2 class="card-pf-title inline-block">Commits</h2>
<a ng-href="{{$projectLink}}/wiki/history//">View All Commits >></a>
</div>
<div class="card-pf-body">
<div ng-include="'plugins/wiki/html/projectCommitsPanel.html'"></div>
</div>
</div>
</div>
</div>
</div>

@ -1,38 +1,38 @@
<div ng-controller="Developer.HomeController">
<div class="jumbotron">
<h1>Perspectives</h1>
<p>
Please choose the perspective you would like to use:
</p>
</div>
<div class="row">
<div class="col-md-6">
<p class="text-center">
<a class="btn btn-lg btn-primary" href="/workspaces" role="button"
title="Create or work on Projects">
<i class="fa fa-tasks"></i>
&nbspDevelop »
</a>
</p>
<p class="text-center">
Work on projects and source code
</p>
</div>
<div class="col-md-6">
<p class="text-center">
<a class="btn btn-lg btn-primary" href="/namespaces" role="button"
title="Look around the various Namespaces at running Pods and Services">
<i class="fa fa-cubes"></i>
&nbsp;Operate »
</a>
</p>
<p class="text-center">
Manage and run Pods and Services
</p>
</div>
</div>
<div ng-controller="Developer.HomeController">
<div class="jumbotron">
<h1>Perspectives</h1>
<p>
Please choose the perspective you would like to use:
</p>
</div>
<div class="row">
<div class="col-md-6">
<p class="text-center">
<a class="btn btn-lg btn-primary" href="/workspaces" role="button"
title="Create or work on Projects">
<i class="fa fa-tasks"></i>
&nbspDevelop »
</a>
</p>
<p class="text-center">
Work on projects and source code
</p>
</div>
<div class="col-md-6">
<p class="text-center">
<a class="btn btn-lg btn-primary" href="/namespaces" role="button"
title="Look around the various Namespaces at running Pods and Services">
<i class="fa fa-cubes"></i>
&nbsp;Operate »
</a>
</p>
<p class="text-center">
Manage and run Pods and Services
</p>
</div>
</div>
</div>

@ -1,10 +1,10 @@
<div class="modal-header">
<h3 class="modal-title">{{operation}}?</h3>
</div>
<div class="modal-body">
Are you sure you wish to {{operation}}?
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()">{{operation}}</button>
<button class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div>
<div class="modal-header">
<h3 class="modal-title">{{operation}}?</h3>
</div>
<div class="modal-body">
Are you sure you wish to {{operation}}?
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()">{{operation}}</button>
<button class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div>

@ -1,79 +1,79 @@
<div class="row" ng-controller="Developer.JenkinsJobController">
<script type="text/ng-template" id="jenkinsBuildIdTemplate.html">
<div class="ngCellText" title="{{row.entity.fullDisplayName}} {{row.entity.result}}">
<a href="{{row.entity.$logsLink}}" title="View the build logs">
<i class="{{row.entity.$iconClass}}"></i>&nbsp;&nbsp;{{row.entity.displayName}}
</a>
</div>
</script>
<script type="text/ng-template" id="jenkinsBuildButtonsTemplate.html">
<div class="ngCellText">
<a class="btn btn-default" href="{{row.entity.$pipelineLink}}" ng-show="row.entity.$pipelineLink" target="View the pipeline for this build">
<i class="fa fa-tasks"></i> Pipeline
</a>
&nbsp;&nbsp;
<a class="btn btn-default" href="{{row.entity.$logsLink}}" ng-show="row.entity.$logsLink" title="View the build logs">
<i class="fa fa-tasks"></i> Logs
</a>
</div>
</script>
<script type="text/ng-template" id="jenkinsBuildTimestampTemplate.html">
<div class="ngCellText" title="Build started at: {{row.entity.$timestamp}}">
{{row.entity.$timestamp.relative()}}
</div>
</script>
<script type="text/ng-template" id="jenkinsBuildDurationTemplate.html">
<div class="ngCellText" title="Build took {{row.entity.$duration}} milliseconds">
{{row.entity.$duration.duration()}}
</div>
</script>
<div class="row">
<div hawtio-breadcrumbs></div>
</div>
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="row filter-header">
<div class="col-md-12">
<span>
<hawtio-filter ng-show="job.builds.length"
ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
placeholder="Filter builds..."></hawtio-filter>
</span>
<button ng-show="fetched"
title="Delete this build history"
class="btn btn-danger pull-right"
ng-disabled="tableConfig.selectedItems.length == 0"
ng-click="deletePrompt(tableConfig.selectedItems)">
<i class="fa fa-remove"></i> Delete
</button>
<a class="btn btn-primary pull-right" ng-click="triggerBuild()"
title="Trigger this build">
<i class="fa fa-play-circle-o"></i> Trigger</a>
</a>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div ng-hide="model.fetched">
<div class="align-center">
<i class="fa fa-spinner fa-spin"></i>
</div>
</div>
<div ng-show="model.fetched">
<div ng-hide="job.builds.length" class="align-center">
<p class="alert alert-info">There are no builds in this job.</p>
</div>
<div ng-show="job.builds.length">
<table class="table table-bordered table-striped" hawtio-simple-table="tableConfig"></table>
</div>
</div>
</div>
</div>
</div>
<div class="row" ng-controller="Developer.JenkinsJobController">
<script type="text/ng-template" id="jenkinsBuildIdTemplate.html">
<div class="ngCellText" title="{{row.entity.fullDisplayName}} {{row.entity.result}}">
<a href="{{row.entity.$logsLink}}" title="View the build logs">
<i class="{{row.entity.$iconClass}}"></i>&nbsp;&nbsp;{{row.entity.displayName}}
</a>
</div>
</script>
<script type="text/ng-template" id="jenkinsBuildButtonsTemplate.html">
<div class="ngCellText">
<a class="btn btn-default" href="{{row.entity.$pipelineLink}}" ng-show="row.entity.$pipelineLink" target="View the pipeline for this build">
<i class="fa fa-tasks"></i> Pipeline
</a>
&nbsp;&nbsp;
<a class="btn btn-default" href="{{row.entity.$logsLink}}" ng-show="row.entity.$logsLink" title="View the build logs">
<i class="fa fa-tasks"></i> Logs
</a>
</div>
</script>
<script type="text/ng-template" id="jenkinsBuildTimestampTemplate.html">
<div class="ngCellText" title="Build started at: {{row.entity.$timestamp}}">
{{row.entity.$timestamp.relative()}}
</div>
</script>
<script type="text/ng-template" id="jenkinsBuildDurationTemplate.html">
<div class="ngCellText" title="Build took {{row.entity.$duration}} milliseconds">
{{row.entity.$duration.duration()}}
</div>
</script>
<div class="row">
<div hawtio-breadcrumbs></div>
</div>
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="row filter-header">
<div class="col-md-12">
<span>
<hawtio-filter ng-show="job.builds.length"
ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
placeholder="Filter builds..."></hawtio-filter>
</span>
<button ng-show="fetched"
title="Delete this build history"
class="btn btn-danger pull-right"
ng-disabled="tableConfig.selectedItems.length == 0"
ng-click="deletePrompt(tableConfig.selectedItems)">
<i class="fa fa-remove"></i> Delete
</button>
<a class="btn btn-primary pull-right" ng-click="triggerBuild()"
title="Trigger this build">
<i class="fa fa-play-circle-o"></i> Trigger</a>
</a>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div ng-hide="model.fetched">
<div class="align-center">
<i class="fa fa-spinner fa-spin"></i>
</div>
</div>
<div ng-show="model.fetched">
<div ng-hide="job.builds.length" class="align-center">
<p class="alert alert-info">There are no builds in this job.</p>
</div>
<div ng-show="job.builds.length">
<table class="table table-bordered table-striped" hawtio-simple-table="tableConfig"></table>
</div>
</div>
</div>
</div>
</div>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save