Updated various changed layout items from 1.5vuetify to 2.x vuetify. Still more grid layout stuff but got sizing changed and some classes that were renamed. Seems nothing is more broken at this point and some things are fixed
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
fixed
|
fixed
|
||||||
>
|
>
|
||||||
<v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
|
<v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
|
||||||
<v-toolbar-title style="width: 300px" class="ml-0 pl-3">
|
<v-toolbar-title style="width: 300px" class="ml-0 pl-4">
|
||||||
<v-icon>{{ appBar.icon }}</v-icon
|
<v-icon>{{ appBar.icon }}</v-icon
|
||||||
>
|
>
|
||||||
<span>{{ appBar.title }}</span>
|
<span>{{ appBar.title }}</span>
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
</v-btn>
|
</v-btn>
|
||||||
</template>
|
</template>
|
||||||
<v-spacer></v-spacer>
|
<v-spacer></v-spacer>
|
||||||
<v-menu bottom left>
|
<v-menu bottom float-left>
|
||||||
<template v-slot:activator="{ on }">
|
<template v-slot:activator="{ on }">
|
||||||
<v-btn text icon v-on="on">
|
<v-btn text icon v-on="on">
|
||||||
<v-icon>fa-ellipsis-v</v-icon>
|
<v-icon>fa-ellipsis-v</v-icon>
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
</v-toolbar-items>
|
</v-toolbar-items>
|
||||||
</v-app-bar>
|
</v-app-bar>
|
||||||
<v-content>
|
<v-content>
|
||||||
<v-container fluid fill-height>
|
<v-container container--fluid fill-height>
|
||||||
<v-layout justify-center>
|
<v-layout justify-center>
|
||||||
<transition name="fade" mode="out-in" @after-leave="afterLeave">
|
<transition name="fade" mode="out-in" @after-leave="afterLeave">
|
||||||
<router-view class="view"></router-view>
|
<router-view class="view"></router-view>
|
||||||
@@ -97,7 +97,7 @@
|
|||||||
</v-content>
|
</v-content>
|
||||||
<v-footer v-if="!isAuthenticated">
|
<v-footer v-if="!isAuthenticated">
|
||||||
<v-layout>
|
<v-layout>
|
||||||
<v-flex primary py-2 text-xs-center white--text xs12>
|
<v-flex primary py-2 text-center white--text xs12>
|
||||||
<div>
|
<div>
|
||||||
<a href="https://ayanova.com" target="_blank">
|
<a href="https://ayanova.com" target="_blank">
|
||||||
<span class="white--text caption"
|
<span class="white--text caption"
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-container>
|
<v-container>
|
||||||
<v-layout text-xs-center wrap>
|
<v-layout text-center wrap>
|
||||||
<v-flex xs12>
|
<v-flex xs12>
|
||||||
<v-img
|
<v-img
|
||||||
:src="require('../assets/logo.svg')"
|
:src="require('../assets/logo.svg')"
|
||||||
class="my-3"
|
class="my-4"
|
||||||
contain
|
contain
|
||||||
height="200"
|
height="200"
|
||||||
></v-img>
|
></v-img>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
<v-flex mb-4 v-if="this.formReady">
|
<v-flex mb-6 v-if="this.formReady">
|
||||||
<h1 class="display-2 font-weight-bold mb-3">
|
<h1 class="display-2 font-weight-bold mb-4">
|
||||||
{{ lt("Welcome") }}
|
{{ lt("Welcome") }}
|
||||||
</h1>
|
</h1>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-flex xs12 md4>
|
<v-flex xs12 md4>
|
||||||
<v-card class="elevation-5 transparent">
|
<v-card class="elevation-5 transparent">
|
||||||
<v-card-text class="text-xs-center">
|
<v-card-text class="text-center">
|
||||||
<v-icon x-large color="secondary">fa-heart</v-icon>
|
<v-icon x-large color="secondary">fa-heart</v-icon>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
<v-card-title primary-title class="layout justify-center">
|
<v-card-title primary-title class="layout justify-center">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-flex xs12 md4>
|
<v-flex xs12 md4>
|
||||||
<v-card class="elevation-5 transparent">
|
<v-card class="elevation-5 transparent">
|
||||||
<v-card-text class="text-xs-center">
|
<v-card-text class="text-center">
|
||||||
<v-icon x-large color="secondary">fa-cannabis</v-icon>
|
<v-icon x-large color="secondary">fa-cannabis</v-icon>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
<v-card-title primary-title class="layout justify-center">
|
<v-card-title primary-title class="layout justify-center">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-flex xs12 md4>
|
<v-flex xs12 md4>
|
||||||
<v-card class="elevation-5 transparent">
|
<v-card class="elevation-5 transparent">
|
||||||
<v-card-text class="text-xs-center">
|
<v-card-text class="text-center">
|
||||||
<v-icon x-large color="secondary">fa-crow</v-icon>
|
<v-icon x-large color="secondary">fa-crow</v-icon>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
<v-card-title primary-title class="layout justify-center">
|
<v-card-title primary-title class="layout justify-center">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-flex xs12 md4>
|
<v-flex xs12 md4>
|
||||||
<v-card class="elevation-5 transparent">
|
<v-card class="elevation-5 transparent">
|
||||||
<v-card-text class="text-xs-center">
|
<v-card-text class="text-center">
|
||||||
<v-icon x-large color="secondary">fa-heart </v-icon>
|
<v-icon x-large color="secondary">fa-heart </v-icon>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
<v-card-title primary-title class="layout justify-center">
|
<v-card-title primary-title class="layout justify-center">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-layout column wrap class="my-5" align-center v-if="this.formState.ready">
|
<v-layout column wrap class="my-12" align-center v-if="this.formState.ready">
|
||||||
<v-flex xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
|
<v-flex xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
|
||||||
<v-alert
|
<v-alert
|
||||||
ref="errorbox"
|
ref="errorbox"
|
||||||
|
|||||||
@@ -17,117 +17,117 @@
|
|||||||
<v-card id="aboutinfocard">
|
<v-card id="aboutinfocard">
|
||||||
<v-subheader>{{ lt("ClientApp") }}</v-subheader>
|
<v-subheader>{{ lt("ClientApp") }}</v-subheader>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("Version") }}:</span>
|
<span class="ml-6 body-1">{{ lt("Version") }}:</span>
|
||||||
<span class="body-2">{{ clientInfo.version }}</span>
|
<span class="body-2">{{ clientInfo.version }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("User") }}:</span>
|
<span class="ml-6 body-1">{{ lt("User") }}:</span>
|
||||||
<span class="body-2">{{ this.$store.state.userName }}</span>
|
<span class="body-2">{{ this.$store.state.userName }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("UserTimeZoneOffset") }}:</span>
|
<span class="ml-6 body-1">{{ lt("UserTimeZoneOffset") }}:</span>
|
||||||
<span class="body-2">
|
<span class="body-2">
|
||||||
{{ ltFormat().timeZoneOffset }}
|
{{ ltFormat().timeZoneOffset }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("DecimalSeparator") }}:</span>
|
<span class="ml-6 body-1">{{ lt("DecimalSeparator") }}:</span>
|
||||||
<span class="body-2">{{ ltFormat().decimalSeparator }}</span>
|
<span class="body-2">{{ ltFormat().decimalSeparator }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("CurrencySymbol") }}:</span>
|
<span class="ml-6 body-1">{{ lt("CurrencySymbol") }}:</span>
|
||||||
<span class="body-2">{{ ltFormat().currencySymbol }}</span>
|
<span class="body-2">{{ ltFormat().currencySymbol }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("ShortDateFormat") }}:</span>
|
<span class="ml-6 body-1">{{ lt("ShortDateFormat") }}:</span>
|
||||||
<span class="body-2">{{ ltFormat().shortDate }}</span>
|
<span class="body-2">{{ ltFormat().shortDate }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("ShortTimeFormat") }}:</span>
|
<span class="ml-6 body-1">{{ lt("ShortTimeFormat") }}:</span>
|
||||||
<span class="body-2">{{ ltFormat().shortTime }}</span>
|
<span class="body-2">{{ ltFormat().shortTime }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("ShortDateAndTimeFormat") }}: </span>
|
<span class="ml-6 body-1">{{ lt("ShortDateAndTimeFormat") }}: </span>
|
||||||
<span class="body-2">{{ ltFormat().shortDateAndTime }}</span>
|
<span class="body-2">{{ ltFormat().shortDateAndTime }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<v-divider class="mt-4"></v-divider>
|
<v-divider class="mt-6"></v-divider>
|
||||||
<v-subheader>{{ lt("Browser") }}</v-subheader>
|
<v-subheader>{{ lt("Browser") }}</v-subheader>
|
||||||
<div v-for="(value, name) in clientInfo.browser" :key="name">
|
<div v-for="(value, name) in clientInfo.browser" :key="name">
|
||||||
<span class="ml-4 body-1">{{ name }}:</span>
|
<span class="ml-6 body-1">{{ name }}:</span>
|
||||||
<span class="body-2">{{ value }}</span>
|
<span class="body-2">{{ value }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<v-divider class="mt-4"></v-divider>
|
<v-divider class="mt-6"></v-divider>
|
||||||
<v-subheader>{{ lt("Server") }}</v-subheader>
|
<v-subheader>{{ lt("Server") }}</v-subheader>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("ServerAddress") }}:</span>
|
<span class="ml-6 body-1">{{ lt("ServerAddress") }}:</span>
|
||||||
<span class="body-2">{{ this.$store.state.apiUrl }}</span>
|
<span class="body-2">{{ this.$store.state.apiUrl }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("Version") }}:</span>
|
<span class="ml-6 body-1">{{ lt("Version") }}:</span>
|
||||||
<span class="body-2">{{ serverInfo.serverVersion }}</span>
|
<span class="body-2">{{ serverInfo.serverVersion }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("SchemaVersion") }}:</span>
|
<span class="ml-6 body-1">{{ lt("SchemaVersion") }}:</span>
|
||||||
<span class="body-2">{{ serverInfo.dbSchemaVersion }}</span>
|
<span class="body-2">{{ serverInfo.dbSchemaVersion }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("ServerTime") }}:</span>
|
<span class="ml-6 body-1">{{ lt("ServerTime") }}:</span>
|
||||||
<span class="body-2">{{ serverInfo.serverLocalTime }}</span>
|
<span class="body-2">{{ serverInfo.serverLocalTime }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("TimeZone") }}:</span>
|
<span class="ml-6 body-1">{{ lt("TimeZone") }}:</span>
|
||||||
<span class="body-2">{{ serverInfo.serverTimeZone }}</span>
|
<span class="body-2">{{ serverInfo.serverTimeZone }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<v-divider class="mt-4"></v-divider>
|
<v-divider class="mt-6"></v-divider>
|
||||||
<v-subheader>{{ lt("HelpLicense") }}</v-subheader>
|
<v-subheader>{{ lt("HelpLicense") }}</v-subheader>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("RegisteredUser") }}:</span>
|
<span class="ml-6 body-1">{{ lt("RegisteredUser") }}:</span>
|
||||||
<span class="body-2">{{
|
<span class="body-2">{{
|
||||||
serverInfo.license.license.licensedTo
|
serverInfo.license.license.licensedTo
|
||||||
}}</span>
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("DatabaseID") }}:</span>
|
<span class="ml-6 body-1">{{ lt("DatabaseID") }}:</span>
|
||||||
<span class="body-2">{{ serverInfo.license.license.dbId }}</span>
|
<span class="body-2">{{ serverInfo.license.license.dbId }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("LicenseSerial") }}:</span>
|
<span class="ml-6 body-1">{{ lt("LicenseSerial") }}:</span>
|
||||||
<span class="body-2">{{ serverInfo.license.license.keySerial }}</span>
|
<span class="body-2">{{ serverInfo.license.license.keySerial }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("LicenseExpiration") }}:</span>
|
<span class="ml-6 body-1">{{ lt("LicenseExpiration") }}:</span>
|
||||||
<span class="body-2">{{
|
<span class="body-2">{{
|
||||||
serverInfo.license.license.licenseExpiration
|
serverInfo.license.license.licenseExpiration
|
||||||
}}</span>
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="ml-4 body-1">{{ lt("SupportedUntil") }}:</span>
|
<span class="ml-6 body-1">{{ lt("SupportedUntil") }}:</span>
|
||||||
<span class="body-2">{{
|
<span class="body-2">{{
|
||||||
serverInfo.license.license.maintenanceExpiration
|
serverInfo.license.license.maintenanceExpiration
|
||||||
}}</span>
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<v-divider class="mt-4"></v-divider>
|
<v-divider class="mt-6"></v-divider>
|
||||||
<v-subheader>{{ lt("LicensedOptions") }}</v-subheader>
|
<v-subheader>{{ lt("LicensedOptions") }}</v-subheader>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-for="item in serverInfo.license.license.features"
|
v-for="item in serverInfo.license.license.features"
|
||||||
:key="item.Feature"
|
:key="item.Feature"
|
||||||
>
|
>
|
||||||
<span class="ml-4 body-1">{{ item.Feature }}</span>
|
<span class="ml-6 body-1">{{ item.Feature }}</span>
|
||||||
<span class="body-2">{{ item.Count ? ": " + item.Count : "" }}</span>
|
<span class="body-2">{{ item.Count ? ": " + item.Count : "" }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<v-divider class="mt-4"></v-divider>
|
<v-divider class="mt-6"></v-divider>
|
||||||
</v-card>
|
</v-card>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
|
|||||||
@@ -172,10 +172,10 @@
|
|||||||
<!-- v-model="obj.customFields" -->
|
<!-- v-model="obj.customFields" -->
|
||||||
</v-flex>
|
</v-flex>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
<!-- <v-layout align-left justify-center row wrap mt-5>
|
<!-- <v-layout align-left justify-center row wrap mt-12>
|
||||||
<v-flex xs6 sm4> FORMtags: {{ obj.tags }} </v-flex>
|
<v-flex xs6 sm4> FORMtags: {{ obj.tags }} </v-flex>
|
||||||
</v-layout> -->
|
</v-layout> -->
|
||||||
<!-- <v-layout align-left justify-center row wrap mt-5>
|
<!-- <v-layout align-left justify-center row wrap mt-12>
|
||||||
<v-flex xs6 sm4>
|
<v-flex xs6 sm4>
|
||||||
READY: {{ formState.ready }}
|
READY: {{ formState.ready }}
|
||||||
<br />
|
<br />
|
||||||
|
|||||||
@@ -22,11 +22,11 @@
|
|||||||
<PartAssemblyTop />
|
<PartAssemblyTop />
|
||||||
<v-flex xs12 md4>
|
<v-flex xs12 md4>
|
||||||
<v-card class="elevation-0 transparent">
|
<v-card class="elevation-0 transparent">
|
||||||
<v-card-text class="text-xs-center">
|
<v-card-text class="text-center">
|
||||||
<v-icon x-large color="accent">fa-lightbulb</v-icon>
|
<v-icon x-large color="accent">fa-lightbulb</v-icon>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
<v-card-title primary-title class="layout justify-center">
|
<v-card-title primary-title class="layout justify-center">
|
||||||
<div class="headline text-xs-center">Material Design</div>
|
<div class="headline text-center">Material Design</div>
|
||||||
</v-card-title>
|
</v-card-title>
|
||||||
<v-card-text>
|
<v-card-text>
|
||||||
Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat
|
Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-container fluid>
|
<v-container container--fluid>
|
||||||
<v-layout row wrap>
|
<v-layout row wrap>
|
||||||
<v-flex xs12 class="hidden-sm-and-down text-xs-center" mt-5 ml-5 pl-5>
|
<v-flex xs12 class="hidden-sm-and-down text-center" mt-12 ml-12 pl-12>
|
||||||
<v-img
|
<v-img
|
||||||
:src="require('../assets/logo.svg')"
|
:src="require('../assets/logo.svg')"
|
||||||
class="my-3"
|
class="my-4"
|
||||||
contain
|
contain
|
||||||
height="200"
|
height="200"
|
||||||
></v-img>
|
></v-img>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
<v-flex xs12 class="hidden-md-and-up text-xs-center">
|
<v-flex xs12 class="hidden-md-and-up text-center">
|
||||||
<v-img :src="require('../assets/logo.svg')" contain height="64"></v-img>
|
<v-img :src="require('../assets/logo.svg')" contain height="64"></v-img>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
<v-flex xs12 sm6 offset-sm3 mt-3>
|
<v-flex xs12 sm6 offset-sm3 mt-4>
|
||||||
<form>
|
<form>
|
||||||
<v-layout column>
|
<v-layout column>
|
||||||
<v-flex>
|
<v-flex>
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
v-on:keyup.enter="login"
|
v-on:keyup.enter="login"
|
||||||
></v-text-field>
|
></v-text-field>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
<v-flex class="text-xs-center" mt-1>
|
<v-flex class="text-center" mt-1>
|
||||||
<v-btn color="primary" v-on:click="login()">
|
<v-btn color="primary" v-on:click="login()">
|
||||||
<v-icon>fa-sign-in-alt</v-icon>
|
<v-icon>fa-sign-in-alt</v-icon>
|
||||||
</v-btn>
|
</v-btn>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<v-container>
|
<v-container>
|
||||||
<v-layout justify-center>
|
<v-layout justify-center>
|
||||||
<v-flex xs12>
|
<v-flex xs12>
|
||||||
<div class="text-xs-center">
|
<div class="text-center">
|
||||||
<v-icon color="red" size="100">fa-dragon</v-icon>
|
<v-icon color="red" size="100">fa-dragon</v-icon>
|
||||||
<div class="headline">
|
<div class="headline">
|
||||||
{{ "404 - " + window.$gz.locale.get("ErrorAPI2010") }}
|
{{ "404 - " + window.$gz.locale.get("ErrorAPI2010") }}
|
||||||
|
|||||||
Reference in New Issue
Block a user