diff --git a/docs/_static/default.css b/docs/_static/default.css index 08dd188a5..5eac7cbb4 100644 --- a/docs/_static/default.css +++ b/docs/_static/default.css @@ -441,9 +441,8 @@ tt.xref, a tt { a.reference { text-decoration: none; - border-bottom: 1px dotted #2BABC4; + border-bottom: 0px dotted #2BABC4; } - a.reference:hover { border-bottom: 1px solid #2794AA; } diff --git a/docs/_static/images/agenda-new-item_de.png b/docs/_static/images/agenda-new-item_de.png deleted file mode 100644 index c3d9ed24f..000000000 Binary files a/docs/_static/images/agenda-new-item_de.png and /dev/null differ diff --git a/docs/_static/images/agenda-new_de.png b/docs/_static/images/agenda-new_de.png new file mode 100644 index 000000000..1374c5b93 Binary files /dev/null and b/docs/_static/images/agenda-new_de.png differ diff --git a/docs/_static/images/agenda-overview_de.png b/docs/_static/images/agenda-overview_de.png index ffb88c60f..fa37d1651 100644 Binary files a/docs/_static/images/agenda-overview_de.png and b/docs/_static/images/agenda-overview_de.png differ diff --git a/docs/_static/images/agenda-pdf_de.png b/docs/_static/images/agenda-pdf_de.png new file mode 100644 index 000000000..8b357bcaa Binary files /dev/null and b/docs/_static/images/agenda-pdf_de.png differ diff --git a/docs/_static/images/agenda-projector_de.png b/docs/_static/images/agenda-projector_de.png new file mode 100644 index 000000000..d42ff5ab2 Binary files /dev/null and b/docs/_static/images/agenda-projector_de.png differ diff --git a/docs/_static/images/application-new_de.png b/docs/_static/images/application-new_de.png deleted file mode 100644 index 74ac55fa3..000000000 Binary files a/docs/_static/images/application-new_de.png and /dev/null differ diff --git a/docs/_static/images/application-overview_de.png b/docs/_static/images/application-overview_de.png index 2d4de5635..a743a5bf9 100644 Binary files a/docs/_static/images/application-overview_de.png and b/docs/_static/images/application-overview_de.png differ diff --git a/docs/_static/images/application-pdf_de.png b/docs/_static/images/application-pdf_de.png new file mode 100644 index 000000000..05d266d72 Binary files /dev/null and b/docs/_static/images/application-pdf_de.png differ diff --git a/docs/_static/images/application-projector_de.png b/docs/_static/images/application-projector_de.png new file mode 100644 index 000000000..090840105 Binary files /dev/null and b/docs/_static/images/application-projector_de.png differ diff --git a/docs/_static/images/application-view_de.png b/docs/_static/images/application-view_de.png index f87df87c9..7fcdd2e5b 100644 Binary files a/docs/_static/images/application-view_de.png and b/docs/_static/images/application-view_de.png differ diff --git a/docs/_static/images/beamer-agenda-overview_de.png b/docs/_static/images/beamer-agenda-overview_de.png deleted file mode 100644 index edac3bd5b..000000000 Binary files a/docs/_static/images/beamer-agenda-overview_de.png and /dev/null differ diff --git a/docs/_static/images/beamer-application-view_de.png b/docs/_static/images/beamer-application-view_de.png deleted file mode 100644 index 21a058585..000000000 Binary files a/docs/_static/images/beamer-application-view_de.png and /dev/null differ diff --git a/docs/_static/images/election-ballot-pdf_de.png b/docs/_static/images/election-ballot-pdf_de.png new file mode 100644 index 000000000..e88a3773f Binary files /dev/null and b/docs/_static/images/election-ballot-pdf_de.png differ diff --git a/docs/_static/images/election-overview_de.png b/docs/_static/images/election-overview_de.png new file mode 100644 index 000000000..b3f8dcb28 Binary files /dev/null and b/docs/_static/images/election-overview_de.png differ diff --git a/docs/_static/images/election-pollview_de.png b/docs/_static/images/election-pollview_de.png new file mode 100644 index 000000000..38329c1be Binary files /dev/null and b/docs/_static/images/election-pollview_de.png differ diff --git a/docs/_static/images/election-view_de.png b/docs/_static/images/election-view_de.png new file mode 100644 index 000000000..ec75a9880 Binary files /dev/null and b/docs/_static/images/election-view_de.png differ diff --git a/docs/_static/images/pdf-agenda_de.png b/docs/_static/images/pdf-agenda_de.png deleted file mode 100644 index 4ee993f6a..000000000 Binary files a/docs/_static/images/pdf-agenda_de.png and /dev/null differ diff --git a/docs/_static/images/pdf-application-view_de.png b/docs/_static/images/pdf-application-view_de.png deleted file mode 100644 index 58ca1c366..000000000 Binary files a/docs/_static/images/pdf-application-view_de.png and /dev/null differ diff --git a/docs/_static/images/t260.agenda-new_de.png b/docs/_static/images/t260.agenda-new_de.png new file mode 100644 index 000000000..d5ab260d3 Binary files /dev/null and b/docs/_static/images/t260.agenda-new_de.png differ diff --git a/docs/_static/images/t260.agenda-overview_de.png b/docs/_static/images/t260.agenda-overview_de.png index 739a33c0d..2ad8f901b 100644 Binary files a/docs/_static/images/t260.agenda-overview_de.png and b/docs/_static/images/t260.agenda-overview_de.png differ diff --git a/docs/_static/images/t260.agenda-pdf_de.png b/docs/_static/images/t260.agenda-pdf_de.png new file mode 100644 index 000000000..2925e74b4 Binary files /dev/null and b/docs/_static/images/t260.agenda-pdf_de.png differ diff --git a/docs/_static/images/t260.agenda-projector_de.png b/docs/_static/images/t260.agenda-projector_de.png new file mode 100644 index 000000000..b38451488 Binary files /dev/null and b/docs/_static/images/t260.agenda-projector_de.png differ diff --git a/docs/_static/images/t260.application-overview_de.png b/docs/_static/images/t260.application-overview_de.png new file mode 100644 index 000000000..3fc9bb716 Binary files /dev/null and b/docs/_static/images/t260.application-overview_de.png differ diff --git a/docs/_static/images/t260.application-pdf_de.png b/docs/_static/images/t260.application-pdf_de.png new file mode 100644 index 000000000..12f5d96a9 Binary files /dev/null and b/docs/_static/images/t260.application-pdf_de.png differ diff --git a/docs/_static/images/t260.application-projector_de.png b/docs/_static/images/t260.application-projector_de.png new file mode 100644 index 000000000..1387542d5 Binary files /dev/null and b/docs/_static/images/t260.application-projector_de.png differ diff --git a/docs/_static/images/t260.application-view_de.png b/docs/_static/images/t260.application-view_de.png new file mode 100644 index 000000000..2c6fcbd15 Binary files /dev/null and b/docs/_static/images/t260.application-view_de.png differ diff --git a/docs/_static/images/t260.beamer-agenda-overview_de.png b/docs/_static/images/t260.beamer-agenda-overview_de.png deleted file mode 100644 index e38fe4a3d..000000000 Binary files a/docs/_static/images/t260.beamer-agenda-overview_de.png and /dev/null differ diff --git a/docs/_static/images/t260.election-ballot-pdf_de.png b/docs/_static/images/t260.election-ballot-pdf_de.png new file mode 100644 index 000000000..7a441eb75 Binary files /dev/null and b/docs/_static/images/t260.election-ballot-pdf_de.png differ diff --git a/docs/_static/images/t260.election-overview_de.png b/docs/_static/images/t260.election-overview_de.png new file mode 100644 index 000000000..0d0678cb1 Binary files /dev/null and b/docs/_static/images/t260.election-overview_de.png differ diff --git a/docs/_static/images/t260.election-pollview_de.png b/docs/_static/images/t260.election-pollview_de.png new file mode 100644 index 000000000..3247774e9 Binary files /dev/null and b/docs/_static/images/t260.election-pollview_de.png differ diff --git a/docs/_static/images/t260.election-view_de.png b/docs/_static/images/t260.election-view_de.png new file mode 100644 index 000000000..eb3c50f12 Binary files /dev/null and b/docs/_static/images/t260.election-view_de.png differ diff --git a/docs/_static/images/t550.agenda-overview_de.png b/docs/_static/images/t550.agenda-overview_de.png index 30f0a4c5f..79c61b4fe 100644 Binary files a/docs/_static/images/t550.agenda-overview_de.png and b/docs/_static/images/t550.agenda-overview_de.png differ diff --git a/docs/de/about.rst b/docs/de/about.rst index 0c2bc50f6..9cdc9412c 100644 --- a/docs/de/about.rst +++ b/docs/de/about.rst @@ -5,64 +5,71 @@ Tagesordnung ------------ - Tagesordnung verwalten -- Eintrag auswählen zur Anzeige am Beamer -- Beamer-Ansicht mit automatischer Aktualisierung bei Änderung (der Beamer läuft z.B. im Browser mit Vollbildmodus als 2. Monitor) -- Eintrag während der Anzeige am Beamer im Webinterface bearbeiten -- Eintrag per Drag&Drop in der Tagesordnung sortieren (Unterpunkte möglich) -- Eintrag als erledigt markieren -- Eintrag auf der Beamer-Ansicht verstecken +- Eintrag auswählen - zur Anzeige am Beamer +- Eintrag bearbeiten - während der Anzeige am Beamer +- Beamer-Ansicht mit automatischer Aktualisierung bei Änderung + (der Beamer läuft im Browser mit Vollbildmodus, z.B. als 2. Monitor) +- Einträge sortieren - per Drag&Drop in der Tagesordnung (Unterpunkte möglich) +- Eintrag markieren - als erledigt und versteckt - Tagesordnung als pdf erzeugen - aktuelle Uhrzeit auf der Beameransicht - |agenda-overview|_ |beamer-agenda-overview|_ - + |agenda-overview|_ |agenda-projector|_ + |agenda-new|_ |agenda-pdf|_ + .. |agenda-overview| image:: _static/images/t260.agenda-overview_de.png :alt: Tagesordnungs-Ansicht .. _agenda-overview: _static/images/agenda-overview_de.png -.. |beamer-agenda-overview| image:: _static/images/t260.beamer-agenda-overview_de.png - :alt: Beamer-Ansicht der Tagesordnungs -.. _beamer-agenda-overview: _static/images/beamer-agenda-overview_de.png +.. |agenda-projector| image:: _static/images/t260.agenda-projector_de.png + :alt: Beamer-Ansicht der Tagesordnung +.. _agenda-projector: _static/images/agenda-projector_de.png - - .. image:: _static/images/agenda-new-item_de.png - :width: 45% +.. |agenda-new| image:: _static/images/t260.agenda-new_de.png :alt: Neuen Tagesordnungseintrag anlegen - - .. image:: _static/images/pdf-agenda_de.png - :width: 45% +.. _agenda-new: _static/images/agenda-new_de.png + +.. |agenda-pdf| image:: _static/images/t260.agenda-pdf_de.png :alt: Tagesordnung als PDF +.. _agenda-pdf: _static/images/agenda-pdf_de.png + Anträge ------- -- Anträge anlegen, bearbeiten, löschen +- Anträge verwalten - Anträge von anderen Teilnehmern unterstützen lassen -- Antragsstatus ändern und Abstimmungsergebnisse eingeben -- Abstimmungsergebenisse aus mehreren Wahlgängen darstellen +- Antragsstatus ändern +- Abstimmungsergebnisse eingeben und darstellen - mehreren Abstimmungsvorgänge möglich (Abstimmungsmodus: Ja/Nein/Enthaltung sowie ungültige und abgegebene Stimmen) - Antrag als Tagesordnungseintrag anlegen und anzeigen -- Änderungshistorie eines Antrags anzeigen +- Versionshistorie eines Antrags anzeigen +- Alle Änderungen eines Antrags (Text, Status, Unterstützer etc.) werden protokolliert - Antragsformular als pdf erzeugen - Übersicht aller Anträge als pdf - Abstimmungsmodus: Ja/Nein/Enthaltungs-Stimmen sowie ungültige und abgegebene Stimmen - .. image:: _static/images/application-overview_de.png - :width: 45% - :alt: Antragsübersicht - - .. image:: _static/images/application-new_de.png - :width: 45% - :alt: Neuer Antrag - - .. image:: _static/images/application-view_de.png - :width: 45% - :alt: Darstellung eines Antrags mit Verwaltugsfunktion - - .. image:: _static/images/beamer-application-view_de.png - :width: 45% - :alt: Beamer-Ansicht eines einzelnen Antrags - + |application-overview|_ |application-pdf|_ + |application-view|_ |application-projector|_ + +.. |application-overview| image:: _static/images/t260.application-overview_de.png + :alt: Übersicht aller Anträge +.. _application-overview: _static/images/application-overview_de.png + +.. |application-pdf| image:: _static/images/t260.application-pdf_de.png + :alt: Antrag als PDF +.. _application-pdf: _static/images/application-pdf_de.png + +.. |application-view| image:: _static/images/t260.application-view_de.png + :alt: Darstellung eines Antrags +.. _application-view: _static/images/application-view_de.png + +.. |application-projector| image:: _static/images/t260.application-projector_de.png + :alt: Beamer-Ansicht eines Antrags +.. _application-projector: _static/images/application-projector_de.png + + + Wahlen ------ @@ -72,6 +79,24 @@ Wahlen - mehrere Wahlgänge und Stichwahlen werden unterstützt - Abstimmungsmodus: Ja-Stimmen oder Ja/Nein/Enthaltungs-Stimmen (abhängig von der Anzahl der Kandiaten und Posten), ungültige und abgegebene Stimmen können eingegeben werden + |election-overview|_ |election-view|_ + |election-pollview|_ |election-ballot-pdf|_ + +.. |election-overview| image:: _static/images/t260.election-overview_de.png + :alt: Übersicht aller Wahlen +.. _election-overview: _static/images/election-overview_de.png + +.. |election-view| image:: _static/images/t260.election-view_de.png + :alt: Darstellung einer Wahl +.. _election-view: _static/images/election-view_de.png + +.. |election-pollview| image:: _static/images/t260.election-pollview_de.png + :alt: Eingabe der Wahlergebnisse +.. _election-pollview: _static/images/election-pollview_de.png + +.. |election-ballot-pdf| image:: _static/images/t260.election-ballot-pdf_de.png + :alt: Wahlschein als PDF +.. _election-ballot-pdf: _static/images/election-ballot-pdf_de.png Teilnehmer @@ -81,6 +106,7 @@ Teilnehmer - importieren von Teilnehmerdaten (im CSV-Format) - Benutzergruppe frei konfigurierbar (voreingestellt sind: *Beobachter, Delegierte, Tagesleitung, Teilnehmerverwaltung*) + Allgemein --------- diff --git a/docs/de/help.rst b/docs/de/help.rst index 2ab801077..310abf09c 100644 --- a/docs/de/help.rst +++ b/docs/de/help.rst @@ -5,21 +5,7 @@ Hilfe Mailinglisten -------------- -**Achtung: Die Erstellung der OpenSlides-Mailinglisten erfolgt Anfang September!** - -OpenSlides hat zwei öffentliche Mailinglisten (in deutscher und englischer Sprache) -zur Koordination der Entwicklung und Diskussion von Tickets, Nutzerfragen -oder speziellen Anwendungsfällen. -Bitte abbonieren Sie eine Mailingliste bevor Sie an diese schreiben wollen. - -Deutsch:: - - users-de@openslides.org - - -Englisch:: - - users-en@openslides.org +**Folgt in Kürze!** @@ -42,4 +28,9 @@ jede Form der Unterstützung! Kontakt ------- -Fragen, Presse- und Supportanfragen richten Sie bitte an `Emanuel Schütze `_. +Sie haben Interess an OpenSlides und denken über einen Einsatz auf +Ihrer Veranstaltung nach? Sie suchen professionelle Unterstützung dafür? +Dann kontaktieren Sie uns! Wir beraten Sie gerne. + +Support- und Presseanfragen sowie Ihre Rückmeldungen und Anregungen richten Sie bitte an +support@openslides.org. diff --git a/docs/en/about.rst b/docs/en/about.rst index 53c29daf7..9e085259f 100644 --- a/docs/en/about.rst +++ b/docs/en/about.rst @@ -7,10 +7,9 @@ Agenda - Manage agenda - Select agenda item to display on projector - Projector view with automatic updating on modification (the projector is running in the browser with full screen mode as 2nd monitor) -- Edit item via web interface while viewing on the projector +- Edit item while viewing on the projector - Sort item via drag and drop in the agenda (sub items possible) -- Mark item as completed -- Hide item in the projector view +- Mark item as completed and hidden - Generate agenda as pdf - Current time on the projector view diff --git a/docs/en/help.rst b/docs/en/help.rst index 7af583ca7..63c0bf164 100644 --- a/docs/en/help.rst +++ b/docs/en/help.rst @@ -5,18 +5,7 @@ Help Mailing lists ------------- -OpenSlides has two public mailing lists in English and German language -for coordinate the development and discussing tickets, user questions or -special use cases. Please subscribe before you are sending an email to a list. - -English language:: - - users-en@openslides.org - -German language:: - - users-de@openslides.org - +**Still under constrution!** Bug reports ----------- @@ -33,4 +22,4 @@ From source code to localizations or artwork, any contribution is welcome! Contact ------- -Questions, press and support requests should be directed to `Emanuel Schütze `_. +Questions, press and support requests should be directed to support@openslides.org.