diff --git a/src/server/ui/home/active/en/index.html b/src/server/ui/home/active/en/index.html index e2b8af5..c43790a 100644 --- a/src/server/ui/home/active/en/index.html +++ b/src/server/ui/home/active/en/index.html @@ -18,8 +18,10 @@ Account | - -

Welcome to libreevent!

-

No start page has been configured yet! Please configure one either by using the configurator in the settings or by uploading your own HTML page to the correct folder as detailed here

+
+ +

Welcome to libreevent!

+

No start page has been configured yet! Please configure one either by using the configurator in the settings or by uploading your own HTML page to the correct folder as detailed here

+
\ No newline at end of file diff --git a/src/server/ui/home/main.css b/src/server/ui/home/main.css index 059b172..699c012 100644 --- a/src/server/ui/home/main.css +++ b/src/server/ui/home/main.css @@ -91,4 +91,11 @@ body { display: flex; flex-direction: column; align-items: center; +} + +.content { + width: 98%; + display: flex; + flex-direction: column; + align-items: center; } \ No newline at end of file diff --git a/src/server/ui/home/templates/default/index.html b/src/server/ui/home/templates/default/index.html index c4c4293..b17ca09 100644 --- a/src/server/ui/home/templates/default/index.html +++ b/src/server/ui/home/templates/default/index.html @@ -18,8 +18,10 @@ Account | - -

Welcome to {{ pageName }}!

-

{{ data.description }}

+
+ +

Welcome to {{ pageName }}!

+

{{ data.description }}

+
\ No newline at end of file diff --git a/src/server/ui/home/templates/default/supportFiles/index.html b/src/server/ui/home/templates/fancy/index.html similarity index 81% rename from src/server/ui/home/templates/default/supportFiles/index.html rename to src/server/ui/home/templates/fancy/index.html index c4c4293..b17ca09 100644 --- a/src/server/ui/home/templates/default/supportFiles/index.html +++ b/src/server/ui/home/templates/fancy/index.html @@ -18,8 +18,10 @@ Account | - -

Welcome to {{ pageName }}!

-

{{ data.description }}

+
+ +

Welcome to {{ pageName }}!

+

{{ data.description }}

+
\ No newline at end of file diff --git a/src/server/ui/home/templates/default/supportFiles/startPage.config.json b/src/server/ui/home/templates/fancy/startPage.config.json similarity index 100% rename from src/server/ui/home/templates/default/supportFiles/startPage.config.json rename to src/server/ui/home/templates/fancy/startPage.config.json diff --git a/src/server/ui/home/templates/default/supportFiles/startPage.json b/src/server/ui/home/templates/fancy/startPage.json similarity index 100% rename from src/server/ui/home/templates/default/supportFiles/startPage.json rename to src/server/ui/home/templates/fancy/startPage.json diff --git a/src/server/ui/home/templates/default/supportFiles copy/style.css b/src/server/ui/home/templates/fancy/supportFiles/style.css similarity index 100% rename from src/server/ui/home/templates/default/supportFiles copy/style.css rename to src/server/ui/home/templates/fancy/supportFiles/style.css diff --git a/src/server/ui/home/templates/modern/index.html b/src/server/ui/home/templates/modern/index.html index c4c4293..b17ca09 100644 --- a/src/server/ui/home/templates/modern/index.html +++ b/src/server/ui/home/templates/modern/index.html @@ -18,8 +18,10 @@ Account | - -

Welcome to {{ pageName }}!

-

{{ data.description }}

+
+ +

Welcome to {{ pageName }}!

+

{{ data.description }}

+
\ No newline at end of file diff --git a/src/server/ui/home/templates/modern/supportFiles/index.html b/src/server/ui/home/templates/modern/supportFiles/index.html deleted file mode 100644 index c4c4293..0000000 --- a/src/server/ui/home/templates/modern/supportFiles/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - {{ pageName }} :: Home - - - - -

Welcome to {{ pageName }}!

-

{{ data.description }}

- - \ No newline at end of file diff --git a/src/server/ui/home/templates/modern/supportFiles/startPage.config.json b/src/server/ui/home/templates/modern/supportFiles/startPage.config.json deleted file mode 100644 index a23d7f1..0000000 --- a/src/server/ui/home/templates/modern/supportFiles/startPage.config.json +++ /dev/null @@ -1 +0,0 @@ -{"subtitle":"this is a test","description":"this is a test description"} \ No newline at end of file diff --git a/src/server/ui/home/templates/modern/supportFiles/startPage.json b/src/server/ui/home/templates/modern/supportFiles/startPage.json deleted file mode 100644 index 3f48614..0000000 --- a/src/server/ui/home/templates/modern/supportFiles/startPage.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "subtitle": { - "id": "subtitle", - "type": "text", - "display": "Subtitle", - "can-be-empty": false - }, - "description": { - "id": "description", - "type": "textarea", - "display": "Description", - "textarea-settings": { - "cols": 50, - "rows": 5, - "max-length": 0, - "min-length": 100 - }, - "can-be-empty": false - }, - "banner": { - "id": "banner", - "type": "image", - "display": "Banner", - "image-settings": { - "upload-name": "homeBanner", - "accept-filetype": "image/jpeg", - "height": 200, - "width": 350 - } - } -} \ No newline at end of file diff --git a/src/webapp/main/src/components/seatplan/userApp/userWindow.vue b/src/webapp/main/src/components/seatplan/userApp/userWindow.vue index 800c2b5..974ed17 100644 --- a/src/webapp/main/src/components/seatplan/userApp/userWindow.vue +++ b/src/webapp/main/src/components/seatplan/userApp/userWindow.vue @@ -505,12 +505,10 @@ } - - diff --git a/src/webapp/main/src/views/admin/EventsView.vue b/src/webapp/main/src/views/admin/EventsView.vue index 939fe0a..b05e305 100644 --- a/src/webapp/main/src/views/admin/EventsView.vue +++ b/src/webapp/main/src/views/admin/EventsView.vue @@ -18,7 +18,7 @@

{{ event.name }}

-

{{ event.description }}

+

{{ event.shortDescription }}

{{ event.date }}
@@ -124,6 +124,11 @@ this.eventList.drafts[ 'content' ] = dat[ 'drafts' ] ?? {}; let sortable = []; for ( let event in this.events ) { + if ( this.events[ event ][ 'description' ].length > 200 ) { + this.events[ event ][ 'shortDescription' ] = this.events[ event ][ 'description' ].slice( 0, 200 ) + '...'; + } else { + this.events[ event ][ 'shortDescription' ] = this.events[ event ][ 'description' ]; + } sortable.push( [ this.events[ event ][ 'eventID' ], new Date( this.events[ event ][ 'date' ] ).getTime() ] ); } sortable.sort( function( a, b ) { diff --git a/src/webapp/main/src/views/purchasing/OrderView.vue b/src/webapp/main/src/views/purchasing/OrderView.vue index 9dc1d2f..a86b453 100644 --- a/src/webapp/main/src/views/purchasing/OrderView.vue +++ b/src/webapp/main/src/views/purchasing/OrderView.vue @@ -16,7 +16,7 @@

{{ event.name }}

-

+

Free seats: {{ event.free }} / {{ event.totalSeats }}

@@ -112,6 +112,11 @@ res.json().then( dat => { this.events = dat ?? {}; for ( let event in dat ) { + if ( this.events[ event ][ 'description' ].length > 200 ) { + this.events[ event ][ 'shortDescription' ] = this.events[ event ][ 'description' ].slice( 0, 200 ) + '...'; + } else { + this.events[ event ][ 'shortDescription' ] = this.events[ event ][ 'description' ]; + } this.events[ event ][ 'logo' ] = new URL( location.protocol + '//' + location.hostname + ':' + location.port + '/eventAssets/' + this.events[ event ].eventID + 'Logo.jpg' ); } } ); diff --git a/src/webapp/main/src/views/purchasing/TicketsDetailsView.vue b/src/webapp/main/src/views/purchasing/TicketsDetailsView.vue index a7c3087..e8c740b 100644 --- a/src/webapp/main/src/views/purchasing/TicketsDetailsView.vue +++ b/src/webapp/main/src/views/purchasing/TicketsDetailsView.vue @@ -16,7 +16,7 @@
-

+

{{ line }}

{{ event.location }}

diff --git a/src/webapp/main/src/views/user/SignupView.vue b/src/webapp/main/src/views/user/SignupView.vue index a028ecd..74a0ea5 100644 --- a/src/webapp/main/src/views/user/SignupView.vue +++ b/src/webapp/main/src/views/user/SignupView.vue @@ -206,25 +206,20 @@ } .login { - background-color: green; width: 100%; - height: 100%; display: flex; - justify-content: center; - align-items: center; - flex-direction: column; } .login-app { background-color: var( --background-color ); - width: 90%; - height: 90%; - padding: 10% 5%; + margin-top: 0; + width: 100%; + height: 100%; + padding: 5% 5%; display: flex; flex-direction: column; align-items: center; justify-content: center; - border-radius: 50px; } .button { @@ -241,10 +236,20 @@ } @media only screen and (min-width: 999px) { + .login { + background-color: green; + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + } + .login-app { width: 50vw; height: min-content; - padding: 5% 5%; + border-radius: 50px; } .field {