overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
sunny 2018-08-03 15:11:48 +09:00
parent a2bd037b19
commit cd33613bc8
30 changed files with 189 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
@overflow/discovery/component/discovery-infra-tree.component.html
View File

@ -10,8 +10,13 @@
<ng-template let-node pTemplate="ZONE">
<!-- 이미 저장된 Infra인 Node-->
<div *ngIf="node.data.date">
<p-toggleButton [disabled]="node.data.target" onLabel="{{node.label}}" offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square"
[style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node)"></p-toggleButton> {{node.data.date | date: 'yy/MM/dd'}}
<p-card>
<div class="ui-discovery-new">NEW</div>
<div class="ui-discovery-title">{{node.label}}</div>
<div class="ui-discovery-date">{{node.data.date | date: 'yy/MM/dd'}}</div>
</p-card>
<!--p-toggleButton [disabled]="node.data.target" onLabel="{{node.label}}" offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square"
[style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node)"></p-toggleButton> {{node.data.date | date: 'yy/MM/dd'}}-->
</div>
</ng-template>
@ -19,14 +24,23 @@
<ng-template let-node pTemplate="HOST">
<!-- 이미 저장된 Infra인 Node-->
<div *ngIf="node.data.date">
<p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" [disabled]="node.data.target"
onLabel="{{node.label}}" offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" (onChange)="onTargetSelect($event, node)"></p-toggleButton> {{node.data.date | date: 'yy/MM/dd'}}
<p-card class="ui-discovery-selected">
<div class="ui-discovery-title">{{node.label}}</div>
<div class="ui-discovery-date">{{node.data.date | date: 'yy/MM/dd'}}</div>
</p-card>
<!--p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" [disabled]="node.data.target"
onLabel="{{node.label}}" offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" (onChange)="onTargetSelect($event, node)"></p-toggleButton> {{node.data.date | date: 'yy/MM/dd'}} -->
</div>
<!-- 새로 Discovery된 Host -->
<div *ngIf="!node.data.date" @discoveryResultAnim>
<p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" onLabel="{{node.label}}"
offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node)"></p-toggleButton> New!!
<p-card>
<div class="ui-discovery-new">NEW</div>
<div class="ui-discovery-title">{{node.label}}</div>
<div class="ui-discovery-date">{{node.data.date | date: 'yy/MM/dd'}}</div>
</p-card>
<!--p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" onLabel="{{node.label}}"
offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node)"></p-toggleButton> New!!-->
</div>
</ng-template>
@ -34,15 +48,24 @@
<ng-template let-node pTemplate="SERVICE">
<!-- 이미 저장된 Infra인 Node-->
<div *ngIf="node.data.date">
<p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" [disabled]="node.data.target"
<p-card class="ui-discovery-disable">
<div class="ui-discovery-title">{{node.label}}</div>
<div class="ui-discovery-date">{{node.data.date | date: 'yy/MM/dd'}}</div>
</p-card>
<!--p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" [disabled]="node.data.target"
onLabel="{{node.label}}" offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}"
(onChange)="onTargetSelect($event, node)"></p-toggleButton> {{node.data.date | date: 'yy/MM/dd'}}
(onChange)="onTargetSelect($event, node)"></p-toggleButton> {{node.data.date | date: 'yy/MM/dd'}} -->
</div>
<!-- 새로 Discovery된 Service -->
<div *ngIf="!node.data.date" @discoveryResultAnim>
<p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" onLabel="{{node.label}}"
offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node)"></p-toggleButton> New!!
<p-card>
<div class="ui-discovery-new">NEW</div>
<div class="ui-discovery-title">{{node.label}}</div>
<div class="ui-discovery-date">{{node.data.date | date: 'yy/MM/dd'}}</div>
</p-card>
<!--p-toggleButton [style]="checkHighlight(node.label, 0) ? {'width':'200px'} : {'width':'200px','opacity':'0.2'}" onLabel="{{node.label}}"
offLabel="{{node.label}}" onIcon="fa-check" offIcon="fa-square" [style]="{'width':'200px'}" (onChange)="onTargetSelect($event, node)"></p-toggleButton> New!! -->
</div>
</ng-template>
</p-tree>

2
@overflow/noauth-probe/component/noauth-probe-list.component.html
View File

@ -1,5 +1,3 @@
<h1>Unauthorized</h1>
<of-error-message [error]="error$ | async" [closable]="false"></of-error-message>
<of-block-progressbar [target]="content" [pending]="pending$ | async"></of-block-progressbar>

3
@overflow/probe/component/probe-download.component.html
View File

@ -1,4 +1,3 @@
<h1>Download</h1>
<p-tabView orientation="left" (onChange)="onChange($event)" [activeIndex]="index" class="ui-tab-bgcolor">
<!--
<p-tabPanel [header]="item.header" *ngFor="let item of items; let i = index" [selected]="i == 0">
@ -10,7 +9,7 @@
Complex Content to Lazy Load1
</ng-template>
</p-tabPanel>
<p-tabPanel header="Windows" >
<p-tabPanel header="Windows">
<ng-template pTemplate="content">
Complex Content to Lazy Load2
</ng-template>

1
@overflow/probe/component/probe-list.component.html
View File

@ -1,4 +1,3 @@
<h1>Probes</h1>
<of-error-message [error]="error$ | async" [closable]="false"></of-error-message>
<of-block-progressbar [target]="content" [pending]="pending$ | async"></of-block-progressbar>

4
@overflow/probe/component/probe-summary.component.html
View File

@ -1,10 +1,10 @@
<p-panel [showHeader]="false" class="ui-top-space-10">
<div *ngIf="probeHost" class="ui-g">
<div class="ui-g-12 ui-md-4 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value">
<of-key-value [key]="'Status'" [value]="connectionStatus"></of-key-value>
<of-key-value [key]="'CIDR'" [value]="probeHost.probe.cidr"></of-key-value>
</div>
<div class="ui-g-12 ui-md-4 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value">
<of-key-value [key]="'Name'" [value]="probeHost.probe.name"></of-key-value>
<of-key-value *ngIf="probeHost.infraHost.infraHostOS" [key]="'OS'" [value]="probeHost.infraHost.infraHostOS.name"></of-key-value>
</div>

4
src/app/commons/component/layout/footer/app.footer.component.html
View File

@ -1,5 +1,4 @@
<div class="ui-g-12">
<div class="ui-g-12">
<div class="ui-g-12 ui-nopad">
<div class="footer">
<div class="card clearfix">
<span class="footer-text-left">Loafle</span>
@ -9,5 +8,4 @@
</span>
</div>
</div>
</div>
</div>

6
src/app/commons/component/layout/topbar/app.topbar.component.html
View File

@ -16,7 +16,7 @@
<i class="material-icons">expand_more</i>
</a>
<ul class="topbar-items animated fadeInDown ultima-main-topmenu" [ngClass]="{'topbar-items-visible': app.topbarMenuActive}">
<ul class="topbar-items animated fadeInDown" [ngClass]="{'topbar-items-visible': app.topbarMenuActive}">
<li #profile class="profile-item" *ngIf="app.profileMode==='top'||app.isHorizontal()" [ngClass]="{'active-top-menu':app.activeTopbarItem === profile}">
<a href="#" (click)="app.onTopbarItemClick($event,profile)">
@ -24,7 +24,7 @@
<span class="topbar-item-name">Jane Williams</span>
</a>
<ul class="ultima-menu animated fadeInDown">
<ul class="ultima-menu animated fadeInDown ultima-main-topmenu">
<li role="menuitem">
<a href="#">
<i class="material-icons">person</i>
@ -134,7 +134,7 @@
</span>
<span class="topbar-item-name">Notifications</span>
</a>
<ul class="ultima-menu animated fadeInDown">
<ul class="ultima-menu animated fadeInDown ultima-main-topmenu">
<!-- <of-notification-badge-container (select)="onNotificationSelect($event)" (viewAll)="onViewAllNotification($event)"></of-notification-badge-container> -->
</ul>
</li>

14
src/app/pages/account/account-page.component.html
View File

@ -1,9 +1,9 @@
<!--<div class="ui-fluid">-->
<!--<div class="ui-g">-->
<!--<div class="ui-g-12">-->
<!--<div class="card no-margin">-->
<router-outlet></router-outlet>
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="ui-g">-->
<!--<div class="ui-g-12">-->
<!--<div class="card">-->
<router-outlet></router-outlet>
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->

4
src/app/pages/account/profile/profile-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Profile</h1>
<of-member-profile></of-member-profile>
</div>

4
src/app/pages/account/settings/settings-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<of-member-totp></of-member-totp>
</div>
</div>

4
src/app/pages/alert/alert-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Alert</h1>
</div>
</div>

4
src/app/pages/dashboard/dashboard-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Dashboard</h1>
</div>
</div>

4
src/app/pages/discovery/discovery-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<of-discovery [probeHostID]="probeHostID"></of-discovery>
</div>
</div>

6
src/app/pages/home/home-page.component.html
View File

@ -1,9 +1,9 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Home works</h1>
</div>
</div>
</div>
</div>
</div>

4
src/app/pages/infra/infra-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<of-infra-map (discovery)="onDiscovery($event)"></of-infra-map>
</div>
</div>

4
src/app/pages/log/log-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Log page</h1>
</div>
</div>

4
src/app/pages/notification/notification-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<of-notification-container (pageChange)="onPageChange($event)"></of-notification-container>
</div>
</div>

4
src/app/pages/overview/overview-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Overview</h1>
</div>
</div>

2
src/app/pages/pages.component.scss
View File

@ -13,7 +13,7 @@
overflow: hidden;
}
.router-outlet{
position: relative;padding: 0px 5px;
position: relative;padding: 0px;
}
.spacer {
width: 100%;

2
src/app/pages/pages.component.ts
View File

@ -24,7 +24,7 @@ export class PagesComponent implements AfterViewInit, OnDestroy, OnInit {
darkMenu = false;
profileMode = 'inline';
profileMode = 'top'; //inline
rotateMenuButton: boolean;

8
src/app/pages/probes/probe-tab-page.component.html
View File

@ -1,10 +1,12 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Probes</h1>
<div class="ui-tabs-noborder">
<of-tabbar [tabs]="tabs"></of-tabbar>
</div>
<div class="card no-margin">
<br>
<router-outlet></router-outlet>
</div>
</div>

4
src/app/pages/report/report-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div class="card">
<h1>Report</h1>
</div>
</div>

6
src/app/pages/sensors/sensor-tab-page.component.html
View File

@ -1,10 +1,10 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div *ngIf="tabs" class="card no-margin">
<div class="ui-g-12 ui-nopad">
<div *ngIf="tabs" class="card">
<of-tabbar [tabs]="tabs"></of-tabbar>
</div>
<div class="card no-margin">
<div class="card">
<router-outlet></router-outlet>
</div>
</div>

2
src/app/pages/targets/target-detail-page.component.html
View File

@ -1,7 +1,7 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="card">
<!--<of-discovery [probeHostID]="probeHostID"></of-discovery>-->
<of-target-detail [targetID]="targetID"></of-target-detail>
</div>

4
src/app/pages/targets/target-list-page.component.html
View File

@ -1,8 +1,8 @@
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<of-target-list [probeID]="probeID" [pageIdx]="pageIdx" (pageChange)="onPageChange($event)" (targetSelect)="onTargetSelect($event)" ></of-target-list>
<div class="card">
<of-target-list [probeID]="probeID" [pageIdx]="pageIdx" (pageChange)="onPageChange($event)" (targetSelect)="onTargetSelect($event)"></of-target-list>
</div>
</div>
</div>

2
src/app/pages/targets/target-page.component.html
View File

@ -1,6 +1,6 @@
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<div class="card">
<!--<router-outlet *ngIf="probeID !== undefined" else complete></router-outlet>-->
<!--<ng-template #complete>-->
<!--<of-pages-target-list [probeID]="probeID" ></of-pages-target-list>-->

6
src/assets/sass/_variables.scss
View File

@ -1,7 +1,7 @@
/* Common */
$textColor:#212121;
$textSecondaryColor:#757575;
$fontSize:16px;
$fontSize:13px; //16px;
$lineHeight:1.5em;
$transitionDuration:.3s;
$borderRadius:3px;
@ -60,5 +60,5 @@ $activeMenuItemBadgeColor:#ffffff;
$activeMenuItemBadgeTextColor:#212121;
/* Compact */
$c-fontSize:14px;
$c-lineHeight:18px;
$c-fontSize:13px; //14px;
$c-lineHeight:1.5em; //18px;

2
src/assets/sass/layout/_compact.scss
View File

@ -8,7 +8,7 @@ body {
li {
a {
i:last-child {
font-size: $c-fontSize + 4;
font-size: $c-fontSize; // + 4;
}
}

2
src/assets/theme/theme-dark-blue.css
View File

@ -3161,7 +3161,7 @@
body .ui-widget,
body .ui-widget .ui-widget {
font-family: "Roboto","Helvetica Neue",sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, Roboto, sans-serif, sans-serif; /* "Roboto","Helvetica Neue",sans-serif;*/
text-decoration: none; }
body .ui-widget-content {
background-color: #ffffff;

68
src/styles.scss
View File

@ -12,6 +12,9 @@
background: url("/assets/layout/images/overFlow_CI_white_200_30.png") top left no-repeat !important;
background-size: 200px 30px; }
// Menu
.layout-container .topbar-items > li.profile-item .profile-image {
width: 24px;
height: 24px; }
.layout-container {
.topbar {
@ -467,7 +470,7 @@
}
&.ultima-main-menu {
margin-top: 16px;
margin-top: 0px; //16px;
padding-bottom: 120px;
}
@ -475,7 +478,7 @@
a {
font-size: 1em;
display: block;
padding: .5em 2.5em .5em 1em;
padding: 1em 2.5em 1em 1.2em;
//color: $textColor;
width: 100%;
box-sizing: border-box;
@ -490,7 +493,7 @@
display: inline-block;
vertical-align: middle;
margin-right: .5em;
font-size: 1.5em;
font-size: 1em !important; //1.5em;
}
i:last-child {
@ -514,7 +517,7 @@
background-color: #cdcdcd !important;
> i {
background-color: #cdcdcd !important;
//background-color: #cdcdcd !important;
}
&:hover {
@ -550,7 +553,8 @@
li {
a {
padding: .5em 2.5em .5em 2em;
//padding: .5em 2.5em .5em 2em;
padding: 1em 2.5em 1em 2.4em;
> span {
//font-size: $fontSize - 1;
@ -628,7 +632,7 @@
}
.footer {
padding: .5em;
padding: 0px;
.footer-text-left {
float: left;
@ -738,8 +742,8 @@
&.profile-item {
.profile-image {
width: 30px !important;
height: 30px !important;
width: 24px !important;
height: 24px !important;
}
}
@ -1557,6 +1561,11 @@
border-collapse: collapse;
border-spacing: 0;
}
//.layout-container .layout-main .layout-content
.layout-container .layout-main .layout-content {
padding: 0px !important;
}
.ui-button-secondary{
background-color : #f5f6f8 !important;
.ui-button-icon-left{
@ -1906,8 +1915,8 @@ body .ui-progressbar .ui-progressbar-value {
.ui-unbg-table{
.ui-table .ui-table-tbody > tr:nth-child(odd) .ui-state-active, .ui-state-highlight {
background-color: #f4f4f4 !important;
color: #203976 !important;
font-weight: bold;
color: #2449a7 !important;
font-weight: normal;
.fa {
color: #ffffff;
@ -1927,6 +1936,11 @@ body .ui-progressbar .ui-progressbar-value {
}
}
}
.ui-tabs-noborder div.ui-tabmenu {
border-left: none !important;
border-right: none !important;
border-top: none !important;
}
//ui-togglebutton
body .ui-discovery .ui-button, .ui-togglebutton {
background-color: #f1f1f1 !important;
@ -1938,3 +1952,37 @@ background-color: #e2e2e2 !important; }
body .ui-discovery .ui-button, .ui-togglebutton.ui-state-active {
background-color: #5180ce !important;
color: #ffffff !important; }
body .ui-discovery, .ui-card {
width: 200px;
}
body .ui-discovery, .ui-discovery-selected .ui-widget-content{
border-color: #5180ce !important;
background: #5180ce !important;
color: #ffffff !important;
}
body .ui-discovery, .ui-discovery-disable .ui-widget-content{
border-color: #e3e4e6 !important;
background: #e3e4e6 !important;
color: #cac9c9 !important;
}
body .ui-discovery, .ui-card-body {
padding: 0.5em !important;
}
body .ui-discovery, .ui-card-body .ui-discovery-title {
width: 100%;
font-size: 1em ;
font-weight: bold ;
margin-bottom: 0.2em ;
}
body .ui-discovery, .ui-card-body .ui-discovery-date {
width: 100%;
font-size: 0.8em;
text-align: right;
}
body .ui-discovery, .ui-card-body .ui-discovery-new {
float: right;
font-size: 0.8em;
font-weight: bold;
text-align: right;
color: #e62a10;
}