1
0
mirror of https://github.com/dkmstr/openuds-gui.git synced 2025-01-03 05:17:36 +03:00

Moving urils to new locations, etc..

This commit is contained in:
Adolfo Gómez García 2018-09-20 09:46:52 +02:00
parent d8db7312fb
commit 529ea1e36f
8 changed files with 93 additions and 89 deletions

View File

@ -7,6 +7,7 @@
.footer {
flex-shrink: 0;
margin: 1em 1em 1em 1em;
height: 1em;
display: flex;
flex-direction: row;
justify-content: flex-end;

View File

@ -68,8 +68,8 @@
flex-flow: row;
align-items: center;
justify-content: center;
height: 2.5rem;
width: 100%;
height: 1.5em;
padding: 0 0.5em;
}
.menu {
@ -102,8 +102,7 @@
margin-right: 0.4em;
}
.forbidden:before {
color: rgb(252, 0, 0);
.alert::before {
position: absolute;
top: 1rem;
left: 1rem;
@ -121,57 +120,22 @@
direction: ltr;
-moz-font-feature-settings: 'liga';
font-feature-settings: 'liga';
text-shadow: 0 6px 8px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
z-index: 1;
}
.forbidden::before {
color: rgb(252, 0, 0);
content: 'update';
text-shadow: 0 6px 8px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
z-index: 1;
}
.maintenance:before {
.maintenance::before {
color: rgb(252, 185, 0);
position: absolute;
top: 1rem;
left: 1rem;
font-size: 8rem;
font-weight: 500;
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
line-height: 1;
letter-spacing: normal;
text-transform: none;
display: inline-block;
white-space: nowrap;
word-wrap: normal;
direction: ltr;
-moz-font-feature-settings: 'liga';
font-feature-settings: 'liga';
content: 'build';
text-shadow: 0 6px 8px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
z-index: 1;
}
.tobereplaced:before {
.tobereplaced::before {
color: rgb(252, 0, 0);
opacity: 0.6;
position: absolute;
top: 0rem;
left: 0rem;
font-size: 10rem;
font-weight: 500;
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
line-height: 1;
letter-spacing: normal;
text-transform: none;
display: inline-block;
white-space: nowrap;
word-wrap: normal;
direction: ltr;
-moz-font-feature-settings: 'liga';
font-feature-settings: 'liga';
content: 'delete_forever';
text-shadow: 0 6px 8px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
z-index: 1;
}

View File

@ -2,7 +2,7 @@ import { Component, OnInit, Input } from '@angular/core';
import { JSONService } from '../../../types/services';
import { UDSApiService } from '../../../uds-api.service';
const MAX_NAME_LENGTH = 60;
const MAX_NAME_LENGTH = 56;
@Component({
selector: 'uds-service',
@ -50,6 +50,10 @@ export class ServiceComponent implements OnInit {
} else if (this.service.not_accesible) {
klass.push('forbidden');
}
if (klass.length > 1 ) {
klass.push('alert');
}
return klass;
}

View File

@ -1,31 +1,49 @@
.errorview {
display: flex;
flex-flow: column wrap;
align-items: center;
justify-content: center;
height: 100%;
width: 100%;
}
.error-container {
margin-top: 3rem;
text-align: center;
position: relative;
}
.errorDialog {
min-width: 30%;
min-height: 30%;
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
display: flex;
flex-flow: column wrap;
align-items: center;
justify-content: center;
padding: 1em;
}
.title {
display: block;
font-size: 2rem;
font-weight: lighter;
text-align: center;
}
.header {
/*background-color: blueviolet;*/
font-size: 1rem;
}
.description {
font-size: 1.2rem;
font-weight: lighter;
}
.message {
font-size: 1rem;
height: 30%;
text-align: center;
min-height: 10rem;
}
.graph {
position: relative;
}
.gears {
width: 10rem;
height: 10rem;
fill: #6AAFE6;
transition: easeInOutQuint();
animation: CogAnimation 5s infinite;
}
.bird {
position: absolute;
width: 3rem;
height: 3rem;
fill: #30A9DE;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
@keyframes CogAnimation {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}

View File

@ -1,10 +1,20 @@
<div class="errorview">
<div class="errorDialog">
<div class="header">
<h1 class="mat-display-1">Error</h1>
</div>
<div class="message">
<h2 class="mat-h2" [innerHTML]="this.error | safeHtml"></h2>
</div>
<div class="error-container">
<div class="graph">
<svg class="bird" viewBox="0 0 55 41" xmlns="http://www.w3.org/2000/svg">
<path d="M35.5 5L54.7.6H32.3L35.5 5zM12.4 40.8l10.3-10.1-6.2-6.7-4.1 16.8zM33.8 5.3L30.5.8l-5.4 4 8.7.5zM20.8 4.6L8.8 0l1.9 4.1 10.1.5zM0 5l15.2 15.4 7.5-14.2L0 5zM34.2 6.8l-9.9-.5-8 15.2 7.4 8.1 8-7.9 2.5-14.9z" /></svg>
<svg class="gears" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
<path d="M29.18 19.07c-1.678-2.908-.668-6.634 2.256-8.328L28.29 5.295c-.897.527-1.942.83-3.057.83-3.36 0-6.085-2.743-6.085-6.126h-6.29c.01 1.043-.25 2.102-.81 3.07-1.68 2.907-5.41 3.896-8.34 2.21L.566 10.727c.905.515 1.69 1.268 2.246 2.234 1.677 2.904.673 6.624-2.24 8.32l3.145 5.447c.895-.522 1.935-.82 3.044-.82 3.35 0 6.066 2.725 6.083 6.092h6.29c-.004-1.035.258-2.08.81-3.04 1.676-2.902 5.4-3.893 8.325-2.218l3.145-5.447c-.9-.515-1.678-1.266-2.232-2.226zM16 22.48c-3.578 0-6.48-2.902-6.48-6.48S12.423 9.52 16 9.52c3.578 0 6.48 2.902 6.48 6.48s-2.902 6.48-6.48 6.48z" /></svg>
</div>
<h1 class="title">
An error has occurred
</h1>
<p class="description" [innerHTML]="this.error | safeHtml">
</p>
<a mat-raised-button color="warn" routerLink="/"><uds-translate>Return</uds-translate></a>
</div>

View File

@ -15,7 +15,7 @@
.login-form {
margin: 0 1rem 2rem 0;
min-width: 30%;
min-width: 32em;
padding: 1rem;
-moz-box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 3px 1px -2px rgba(0,0,0,0.12),0 1px 5px 0 rgba(0,0,0,0.2);
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 3px 1px -2px rgba(0,0,0,0.12),0 1px 5px 0 rgba(0,0,0,0.2);
@ -40,3 +40,10 @@
.mat-form-field {
width: 100%;
}
/* responsive part */
@media only screen and (max-width: 744px) {
.login-form {
min-width: 80%;
}
}

View File

@ -20,8 +20,8 @@
}
</script>
<!-- DYNAMIC_DATA -->
<script type="text/javascript" src="server/es.js"></script>
<script type="text/javascript" src="/uds/js"></script>
<script type="text/javascript" src="/uds/utility/i18n/es.js"></script>
<script type="text/javascript" src="/uds/utility/uds.js"></script>
<!-- ENDDYNAMIC_DATA -->
</head>

View File

@ -73,8 +73,8 @@ def locateTypeScriptFiles():
def fixIndex():
print('Fixing index.html...')
translations = '<script type="text/javascript" src="{% url \'uds.web.views.jsCatalog\' LANGUAGE_CODE %}"></script>'
jsdata = '<script type="text/javascript" src="{% url \'uds.js\' %}"></script>'
translations = '<script type="text/javascript" src="{% url \'utility.jsCatalog\' LANGUAGE_CODE %}"></script>'
jsdata = '<script type="text/javascript" src="{% url \'utility.js\' %}"></script>'
# Change index.html, to include django required staff
translatePattern = re.compile(
'<!-- DYNAMIC_DATA -->.*<!-- ENDDYNAMIC_DATA -->', re.MULTILINE | re.DOTALL)