Motion Works
diff --git a/client/src/app/site/motions/motion-list/motion-list.component.ts b/client/src/app/site/motions/motion-list/motion-list.component.ts
index 7eada3d5d..f6243b1da 100644
--- a/client/src/app/site/motions/motion-list/motion-list.component.ts
+++ b/client/src/app/site/motions/motion-list/motion-list.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { BaseComponent } from 'app/base.component';
+import { TranslateService } from '@ngx-translate/core';
@Component({
selector: 'app-motion-list',
@@ -8,8 +9,8 @@ import { BaseComponent } from 'app/base.component';
styleUrls: ['./motion-list.component.css']
})
export class MotionListComponent extends BaseComponent implements OnInit {
- constructor(titleService: Title) {
- super(titleService);
+ constructor(titleService: Title, protected translate: TranslateService) {
+ super(titleService, translate);
}
ngOnInit() {
diff --git a/client/src/app/site/settings/settings-list/settings-list.component.ts b/client/src/app/site/settings/settings-list/settings-list.component.ts
index b54e437ae..ab75bade8 100644
--- a/client/src/app/site/settings/settings-list/settings-list.component.ts
+++ b/client/src/app/site/settings/settings-list/settings-list.component.ts
@@ -1,12 +1,19 @@
import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
+import { TranslateService } from '@ngx-translate/core';
+import { BaseComponent } from '../../../base.component';
@Component({
selector: 'app-settings-list',
templateUrl: './settings-list.component.html',
styleUrls: ['./settings-list.component.css']
})
-export class SettingsListComponent implements OnInit {
- constructor() {}
+export class SettingsListComponent extends BaseComponent implements OnInit {
+ constructor(titleService: Title, protected translate: TranslateService) {
+ super(titleService, translate);
+ }
- ngOnInit() {}
+ ngOnInit() {
+ super.setTitle('Settings');
+ }
}
diff --git a/client/src/app/site/site.component.html b/client/src/app/site/site.component.html
index 98a2cf5ec..131c0549d 100644
--- a/client/src/app/site/site.component.html
+++ b/client/src/app/site/site.component.html
@@ -1,10 +1,8 @@
-
-
@@ -16,7 +14,6 @@
-
Edit Profile
@@ -30,24 +27,7 @@
Logout
-
-
-
-
-
-
-
@@ -87,9 +67,12 @@
+ the second one shall be handled by the apps -->
-
diff --git a/client/src/app/site/site.component.scss b/client/src/app/site/site.component.scss
index 9ca546ea7..575e82c65 100644
--- a/client/src/app/site/site.component.scss
+++ b/client/src/app/site/site.component.scss
@@ -1,11 +1,16 @@
mat-sidenav-container {
height: 100%;
+
+ main {
+ flex: 1;
+ position: relative;
+ }
}
.projector-button {
- position: absolute;
+ position: fixed;
bottom: 10px;
- right: 10px;
+ right: 20px;
}
.os-logo-container {
diff --git a/client/src/app/site/site.component.ts b/client/src/app/site/site.component.ts
index 41eface9d..5e2306e22 100644
--- a/client/src/app/site/site.component.ts
+++ b/client/src/app/site/site.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, HostBinding } from '@angular/core';
import { Router } from '@angular/router';
import { BreakpointObserver, Breakpoints, BreakpointState } from '@angular/cdk/layout';
@@ -29,7 +29,6 @@ export class SiteComponent extends BaseComponent implements OnInit {
* True if Viewport equals mobile or small resolution. Set by breakpointObserver.
*/
isMobile = false;
-
/**
* Constructor
*
@@ -47,7 +46,7 @@ export class SiteComponent extends BaseComponent implements OnInit {
private operator: OperatorService,
private router: Router,
private breakpointObserver: BreakpointObserver,
- private translate: TranslateService,
+ protected translate: TranslateService,
public dialog: MatDialog
) {
super();
diff --git a/client/src/app/site/start/start.component.ts b/client/src/app/site/start/start.component.ts
index bf35b97a7..934530e63 100644
--- a/client/src/app/site/start/start.component.ts
+++ b/client/src/app/site/start/start.component.ts
@@ -17,12 +17,12 @@ export class StartComponent extends BaseComponent implements OnInit {
//useage of translation with variables in code and view
username = { user: this.operator.username };
- constructor(titleService: Title, private translate: TranslateService, private operator: OperatorService) {
- super(titleService);
+ constructor(titleService: Title, protected translate: TranslateService, private operator: OperatorService) {
+ super(titleService, translate);
}
ngOnInit() {
- super.setTitle('Start page'); //TODO translate
+ super.setTitle('Home');
}
//quick testing of some data store functions
diff --git a/client/src/app/site/users/user-list/user-list.component.ts b/client/src/app/site/users/user-list/user-list.component.ts
index acde5c7c3..16d1d3f77 100644
--- a/client/src/app/site/users/user-list/user-list.component.ts
+++ b/client/src/app/site/users/user-list/user-list.component.ts
@@ -1,12 +1,19 @@
import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
+import { TranslateService } from '@ngx-translate/core';
+import { BaseComponent } from '../../../base.component';
@Component({
selector: 'app-user-list',
templateUrl: './user-list.component.html',
styleUrls: ['./user-list.component.css']
})
-export class UserListComponent implements OnInit {
- constructor() {}
+export class UserListComponent extends BaseComponent implements OnInit {
+ constructor(titleService: Title, protected translate: TranslateService) {
+ super(titleService, translate);
+ }
- ngOnInit() {}
+ ngOnInit() {
+ super.setTitle('Users');
+ }
}
diff --git a/client/src/assets/i18n/de.json b/client/src/assets/i18n/de.json
index 8f0dffb58..ff659e2a3 100644
--- a/client/src/assets/i18n/de.json
+++ b/client/src/assets/i18n/de.json
@@ -1,10 +1,21 @@
{
"Agenda": "Tagesordnung",
+ "Assignments": "Wahlen",
+ "Change Password": "Passwort ändern",
+ "Edit Profile": "Profil bearbeiten",
"English": "Englisch",
- "French": "",
+ "Files": "Dateien",
+ "French": "Französisch",
"German": "Deutsch",
"Hello user": "Hallo {{user}}",
"Home": "Startseite",
+ "Legal Notice": "Impressum",
+ "Log In": "Anmelden",
+ "Logout": "Abmelden",
"Motions": "Anträge",
+ "Participants": "Teilnehmer",
+ "Privacy Policy": "Datenschutz",
+ "Settings": "Einstellungen",
+ "Users": "Benutzer",
"Welcome to OpenSlides": "Willkommen bei OpenSlides"
}
diff --git a/client/src/assets/i18n/en.json b/client/src/assets/i18n/en.json
index 6a2320989..82e9d9e5a 100644
--- a/client/src/assets/i18n/en.json
+++ b/client/src/assets/i18n/en.json
@@ -1,10 +1,21 @@
{
- "Agenda": "Agenda",
- "English": "English",
+ "Agenda": "",
+ "Assignments": "",
+ "Change Password": "",
+ "Edit Profile": "",
+ "English": "",
+ "Files": "",
"French": "",
- "German": "German",
+ "German": "",
"Hello user": "Hello {{user}}",
- "Home": "Home",
- "Motions": "Motions",
- "Welcome to OpenSlides": "Welcome to OpenSlides"
+ "Home": "",
+ "Legal Notice": "",
+ "Log In": "",
+ "Logout": "",
+ "Motions": "",
+ "Participants": "",
+ "Privacy Policy": "",
+ "Settings": "",
+ "Users": "",
+ "Welcome to OpenSlides": ""
}
diff --git a/client/src/assets/i18n/fr.json b/client/src/assets/i18n/fr.json
index ae7963a9d..adfe4fed6 100644
--- a/client/src/assets/i18n/fr.json
+++ b/client/src/assets/i18n/fr.json
@@ -1,10 +1,21 @@
{
"Agenda": "",
+ "Assignments": "",
+ "Change Password": "",
+ "Edit Profile": "",
"English": "",
+ "Files": "",
"French": "",
"German": "",
"Hello user": "",
"Home": "",
+ "Legal Notice": "",
+ "Log In": "",
+ "Logout": "",
"Motions": "",
+ "Participants": "",
+ "Privacy Policy": "",
+ "Settings": "",
+ "Users": "",
"Welcome to OpenSlides": ""
}
diff --git a/client/src/styles.scss b/client/src/styles.scss
index eafeb0a95..73b17caf4 100644
--- a/client/src/styles.scss
+++ b/client/src/styles.scss
@@ -27,7 +27,6 @@ body {
right: 0;
margin: 0;
padding: 0;
- overflow: hidden !important;
height: 100% !important;
}
@@ -39,9 +38,8 @@ body {
router-outlet ~ * {
position: absolute;
- height: 100%;
+ height: 100% !important;
width: 100%;
- overflow: hidden !important;
}
/**the plus button in Motion, Agenda, etc*/