Skip to content
This repository has been archived by the owner on Jan 4, 2020. It is now read-only.

Fixes and improvements #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/locales/de/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,11 @@ export default {
'action-upgrade-instance': 'Aktualisieren',
'new-instance': 'Neue OpenSlides-Instanz erstellen',
'instance-url': 'Instanz-URL',
'projector-logo': 'Projektor-Logo',
'upload_logo': 'Logo hochladen',
'remove_logo': 'Logo löschen',
'delete': 'Löschen',
'close': 'Schließen',
'save': 'Speichern',
'cancel': 'Abbrechen',
'no-upgrades-available': 'Keine Aktualisierung verfügbar',
'upload_projector_logo': 'Projektor-Logo hochladen',
'still-installing': 'Das Erstellen kann bis zu 2 Minuten dauern. Warten Sie, bis der Status auf "active" steht. Laden Sie regelmäßig dise Seite neu, um den Status zu aktualisieren.',
'title-upgrade': 'Instanz <b>{{instance}}</b> aktualisieren auf...',
'active': 'aktiv',
Expand Down
4 changes: 0 additions & 4 deletions app/locales/en/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ export default {

'new-instance': 'Create new OpenSlides instance',
'instance-url': 'Instance URL',
'projector-logo': 'Projector logo',
'upload_logo': 'Upload logo',
'remove_logo': 'Remove',
'delete': 'Delete',
'close': 'Close',
'save': 'Spave',
'cancel': 'Cancel',
'upload_projector_logo': 'Upload projector logo',
'still-installing': 'It can take up to two minutes to create the instance. Wait until the status is set to "active". Reload this page regularly to update the status.',
'title-upgrade': 'Upgrade instance {{instance}} to...',
'active': 'active',
Expand Down
5 changes: 0 additions & 5 deletions app/models/instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ export default DS.Model.extend({
event_location: DS.attr('string'),
event_organizer: DS.attr('string'),

projector_logo: DS.attr('string'),
projector_logo_url: Ember.computed('projector_logo', function() {
return '/api/blobs/' + this.get('projector_logo');
}),

// Admin Attributes
admin_first_name: DS.attr('string'),
admin_last_name: DS.attr('string'),
Expand Down
9 changes: 7 additions & 2 deletions app/pods/components/instance-add-form/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ const validations = {
export default Ember.Component.extend({
store: Ember.inject.service(),
changeset: function () {
return new Changeset(this.get('instance'), lookupValidator(validations), validations);
}.property('instance'),
let changeset = new Changeset(this.get('instance'), lookupValidator(validations), validations);
changeset.set('osversion', this.get('defaultVersion'));
return changeset;
}.property('instance', 'versions'),
defaultVersion: Ember.computed('versions.@each', function() {
return this.get('versions').filter((version) => {return version.get('default');})[0];
}),

versionSort: ['id:desc'],
sortedVersions: Ember.computed.sort('versions', 'versionSort'),
Expand Down
5 changes: 0 additions & 5 deletions app/pods/components/instance-add-form/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
{{f.text-field "event_location"}}
{{f.text-field "event_organizer"}}

<div class="form-field">
<label class="form-field--label">{{t 'projector-logo'}}</label>
{{instance-projector-logo model=instance}}
</div>

<h3>{{t 'admin_data'}}</h3>

{{f.text-field "admin_first_name"}}
Expand Down
3 changes: 0 additions & 3 deletions app/pods/components/instance-list-item/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@
</tr>
</table>
</div>
<div class="col-sm-3">
{{instance-projector-logo model=instance uploaded='uploaded'}}
</div>
<div class="col-sm-2">
<div class="btn-group-vertical" role="group" aria-label="...">
{{#if (eq instance.state 'active')}}
Expand Down
17 changes: 0 additions & 17 deletions app/pods/components/instance-projector-logo/component.js

This file was deleted.

16 changes: 0 additions & 16 deletions app/pods/components/instance-projector-logo/template.hbs

This file was deleted.

This file was deleted.