Update Semantic
Fixes #40,#24
This commit is contained in:
Tim Schumacher
parent
1715f27f44
commit
2027b94179
621 changed files with 172488 additions and 15939 deletions
|
|
@ -4,8 +4,7 @@
|
|||
{% stylesheets filter="compass"
|
||||
"@CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss"
|
||||
"@CalciferBundle/Resources/assets/css/events.scss"
|
||||
"@CalciferBundle/Resources/assets/css/leaflet.scss"
|
||||
%}
|
||||
"@CalciferBundle/Resources/assets/css/leaflet.scss" %}
|
||||
<link rel="stylesheet" href="{{ asset_url }}"/>
|
||||
{% endstylesheets %}
|
||||
{% endblock %}
|
||||
|
|
@ -15,21 +14,18 @@
|
|||
"@CalciferBundle/Resources/assets/js/jquery.datetimepicker.js"
|
||||
"@CalciferBundle/Resources/assets/js/repeating_events.js"
|
||||
"@CalciferBundle/Resources/assets/js/events.js"
|
||||
"@CalciferBundle/Resources/assets/js/leaflet.js"
|
||||
%}
|
||||
"@CalciferBundle/Resources/assets/js/leaflet.js" %}
|
||||
<script src="{{ asset_url }}"></script>
|
||||
{% endjavascripts %}
|
||||
{% endblock %}
|
||||
|
||||
{% block body -%}
|
||||
<div class="ui one column page grid">
|
||||
<div class="ui column">
|
||||
<h1>Wiederholenden Termin bearbeiten</h1>
|
||||
</div>
|
||||
<div class="ui basic segment">
|
||||
<h1 class="ui green dividing header">Wiederholenden Termin bearbeiten</h1>
|
||||
</div>
|
||||
|
||||
<div class="ui one column page grid">
|
||||
<div class="ui column">
|
||||
<div class="ui basic segment">
|
||||
<div class="ui segment">
|
||||
{{ include('CalciferBundle:RepeatingEvent:repeating_event_form.html.twig',{'entity':entity}) }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,51 +15,47 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block body -%}
|
||||
<div class="ui one column page grid title">
|
||||
<div class="ui column">
|
||||
<h1 class="ui header">
|
||||
Wiederholende Termine
|
||||
</h1>
|
||||
</div>
|
||||
<div class="ui basic segment">
|
||||
<h1 class="ui green dividing header">
|
||||
Wiederholende Termine
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
<div class="ui one column page grid stackable">
|
||||
<div class="column">
|
||||
<table class="ui table">
|
||||
<thead>
|
||||
<div class="ui basic segment">
|
||||
<table class="ui table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Zusammenfassung</th>
|
||||
<th>Nächstes Datum</th>
|
||||
<th>Wiederholungsmuster</th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for entity in entities %}
|
||||
<tr>
|
||||
<th>Zusammenfassung</th>
|
||||
<th>Nächstes Datum</th>
|
||||
<th>Wiederholungsmuster</th>
|
||||
<th>Aktionen</th>
|
||||
<td>
|
||||
{{ entity.summary }}
|
||||
</td>
|
||||
<td>
|
||||
{{ entity.nextdate.format('Y-m-d H:i') }}
|
||||
</td>
|
||||
<td>
|
||||
{{ entity.repeating_pattern }}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ path('repeating_event_edit', {'slug':entity.slug}) }}">Bearbeiten</a> |
|
||||
<a href="{{ path('repeating_event_delete', {'slug':entity.slug}) }}">Löschen</a>
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for entity in entities %}
|
||||
<tr>
|
||||
<td>
|
||||
{{ entity.summary }}
|
||||
</td>
|
||||
<td>
|
||||
{{ entity.nextdate.format('Y-m-d H:i') }}
|
||||
</td>
|
||||
<td>
|
||||
{{ entity.repeating_pattern }}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ path('repeating_event_edit', {'slug':entity.slug}) }}">Bearbeiten</a> |
|
||||
<a href="{{ path('repeating_event_delete', {'slug':entity.slug}) }}">Löschen</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="4"><a href="{{ path('repeating_event_new') }}">Neuen wiederholenden Termin anlegen</a></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="4"><a class="ui green button" href="{{ path('repeating_event_new') }}">Neuen wiederholenden Termin anlegen</a></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,12 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block body -%}
|
||||
<div class="ui one column page grid">
|
||||
<div class="ui column">
|
||||
<h1>Wiederholenden Termin erstellen</h1>
|
||||
</div>
|
||||
<div class="ui basic segment">
|
||||
<h1 class="ui green dividing header">Wiederholenden Termin erstellen</h1>
|
||||
</div>
|
||||
|
||||
<div class="ui one column page grid">
|
||||
<div class="ui column">
|
||||
<div class="ui basic segment">
|
||||
<div class="ui segment">
|
||||
{{ include('CalciferBundle:RepeatingEvent:repeating_event_form.html.twig') }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
<form method="post"
|
||||
<form class="ui form" method="post"
|
||||
action="{% if entity.id|default(0) > 0 %}{{ path('repeating_event_update',{'slug':entity.slug}) }}{% else %}{{ path('repeating_event_create') }}{% endif %}">
|
||||
<div class="ui form segment">
|
||||
<div class="field">
|
||||
<label class="control-label required" for="event_startdate">Nächster Termin</label>
|
||||
<div class="required field">
|
||||
<label for="event_startdate">Nächster Termin</label>
|
||||
|
||||
<div class="ui left labeled icon input">
|
||||
<div class="ui icon input">
|
||||
<input type="datetime"
|
||||
id="event_nextdate"
|
||||
name="nextdate"
|
||||
|
|
@ -15,15 +14,16 @@
|
|||
|
||||
<i class="icon calendar"></i>
|
||||
|
||||
<div class="ui corner label">
|
||||
<i class="icon asterisk"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui label">
|
||||
Bitte gebe das Datum des nächsten Termin im Format <a href="http://de.wikipedia.org/wiki/ISO_8601">ISO 8601</a> an.
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label class="control-label required" for="event_duration">Dauer</label>
|
||||
<label for="event_duration">Dauer</label>
|
||||
|
||||
<div class="ui left labeled input attached-label">
|
||||
<div class="ui input">
|
||||
<input type="text"
|
||||
id="event_duration"
|
||||
name="duration"
|
||||
|
|
@ -31,16 +31,16 @@
|
|||
value="{{ entity.duration }}"
|
||||
class="form-control">
|
||||
|
||||
<div class="ui bottom attached label">
|
||||
Hier gibst du bitte die Dauer der Veranstaltung in Minuten an.
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui label">
|
||||
Hier gibst du bitte die Dauer der Veranstaltung in Minuten an.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label class="control-label required" for="event_duration">Terminwiederholungsmuster</label>
|
||||
<div class="required field">
|
||||
<label for="event_duration">Terminwiederholungsmuster</label>
|
||||
|
||||
<div class="ui left labeled input attached-label">
|
||||
<div class="ui input">
|
||||
<input type="text"
|
||||
id="repeating_pattern"
|
||||
name="repeating_pattern"
|
||||
|
|
@ -48,22 +48,18 @@
|
|||
required="required"
|
||||
maxlength="255"
|
||||
class="form-control">
|
||||
</div>
|
||||
|
||||
<div class="ui corner label">
|
||||
<i class="icon asterisk"></i>
|
||||
</div>
|
||||
|
||||
<div class="ui bottom attached label">
|
||||
Gebe hier ein <a href="{{ path("repeating_patterns") }}">Wiederholungsmuster</a> an.
|
||||
</div>
|
||||
<div class="ui label">
|
||||
Gebe hier ein <a href="{{ path("repeating_patterns") }}">Wiederholungsmuster</a> an.
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label class="" for="event_summary">Zusammenfassung</label>
|
||||
<div class="required field">
|
||||
<label for="event_summary">Zusammenfassung</label>
|
||||
|
||||
<div class="ui left labeled input">
|
||||
<div class="ui input">
|
||||
<input type="text"
|
||||
id="event_summary"
|
||||
name="summary"
|
||||
|
|
@ -71,29 +67,24 @@
|
|||
required="required"
|
||||
maxlength="255"
|
||||
class="form-control">
|
||||
|
||||
<div class="ui corner label">
|
||||
<i class="icon asterisk"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label class="control-label required" for="event_summary">Beschreibung</label>
|
||||
<label for="event_summary">Beschreibung</label>
|
||||
|
||||
<div class="ui left labeled icon input attached-label">
|
||||
<div class="ui input">
|
||||
<textarea name="description">{{ entity.description|default('') }}</textarea>
|
||||
|
||||
<div class="ui bottom attached label">Du kannst hier <a href="https://en.wikipedia.org/wiki/Markdown">Markdown</a>
|
||||
benutzen.
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui label">Du kannst hier <a href="https://en.wikipedia.org/wiki/Markdown">Markdown</a>
|
||||
benutzen.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label class="control-label required" for="event_url">URL</label>
|
||||
<label for="event_url">URL</label>
|
||||
|
||||
<div class="ui left labeled icon input">
|
||||
<div class="ui icon input">
|
||||
<input type="text"
|
||||
id="event_url"
|
||||
name="url"
|
||||
|
|
@ -104,10 +95,10 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<div class="required field">
|
||||
<label class="control-label required" for="event_location">Ort</label>
|
||||
|
||||
<div class="ui left labeled icon input attached-{% if entity.location.lat|default(0) > 0 %}geo-{% endif %}label">
|
||||
<div class="ui icon input">
|
||||
<input type="text"
|
||||
id="event_location"
|
||||
name="location"
|
||||
|
|
@ -117,27 +108,27 @@
|
|||
<input type="hidden" name="location_lat" value="{{ entity.location.lat|default('') }}">
|
||||
<input type="hidden" name="location_lon" value="{{ entity.location.lon|default('') }}">
|
||||
<i class="icon map marker"></i>
|
||||
</div>
|
||||
|
||||
<div class="ui bottom attached label">
|
||||
Du kannst zu diesem Ort auch Geokoordinaten <a href="#" class="add_geo">hinterlegen</a>.<br/>
|
||||
<span class="coords">{% if entity.location.lat|default(0) > 0 %}Folgende Koordinaten sind angegeben: lat:{{ entity.location.lat }}, lon:{{ entity.location.lon }}{% endif %}</span>
|
||||
<div class="ui label">
|
||||
Du kannst zu diesem Ort auch Geokoordinaten <a href="#" class="add_geo">hinterlegen</a> (JavaScript erforderlich).<br/>
|
||||
<span class="coords">{% if entity.location.lat|default(0) > 0 %}Folgende Koordinaten sind angegeben: lat:{{ entity.location.lat }}, lon:{{ entity.location.lon }}{% endif %}</span>
|
||||
</div>
|
||||
<div class="ui modal geo chooser">
|
||||
<i class="close icon"></i>
|
||||
|
||||
<div class="header">
|
||||
Wähle einen Punkt auf der Karte
|
||||
</div>
|
||||
<div class="ui modal geo chooser">
|
||||
<i class="close icon"></i>
|
||||
|
||||
<div class="header">
|
||||
Wähle einen Punkt auf der Karte
|
||||
<div class="content">
|
||||
<div id="map"></div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="ui button cancel">
|
||||
Cancel
|
||||
</div>
|
||||
<div class="content">
|
||||
<div id="map"></div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="ui button cancel">
|
||||
Cancel
|
||||
</div>
|
||||
<div class="ui button ok">
|
||||
Okay
|
||||
</div>
|
||||
<div class="ui button ok">
|
||||
Okay
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -146,21 +137,20 @@
|
|||
<div class="field">
|
||||
<label class="" for="event_tags">Tags</label>
|
||||
|
||||
<div class="ui left icon input attached-label">
|
||||
<div class="ui icon input">
|
||||
<input type="text"
|
||||
id="event_tags"
|
||||
name="tags"
|
||||
value="{{ entity.getTagsAsText() }}"
|
||||
class="form-control">
|
||||
<i class="icon tag"></i>
|
||||
</div>
|
||||
|
||||
<div class="ui bottom attached label">Du kannst hier kommasepariert <a
|
||||
href="https://en.wikipedia.org/wiki/Tag_%28metadata%29">Tags</a> angeben.
|
||||
</div>
|
||||
<div class="ui label">Du kannst hier kommasepariert <a
|
||||
href="https://en.wikipedia.org/wiki/Tag_%28metadata%29">Tags</a> angeben.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="submit" class="ui button blue" value="Speichern"/>
|
||||
</div>
|
||||
<input type="submit" class="ui green button" value="Speichern"/>
|
||||
|
||||
</form>
|
||||
|
|
@ -15,22 +15,30 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block body -%}
|
||||
<div class="ui one column page grid title">
|
||||
<div class="ui column">
|
||||
<h1 class="ui header">
|
||||
Wiederholungsmuster
|
||||
</h1>
|
||||
</div>
|
||||
<div class="ui basic segment">
|
||||
<h1 class="ui green dividing header">
|
||||
Wiederholungsmuster
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
<div class="ui one column page grid segment">
|
||||
<div class="ui column">
|
||||
<div class="ui basic segment">
|
||||
<div class="ui segment">
|
||||
<p>Es gibt 2 verschiedene Wiederholungsmustertypen. Feste Termine oder Interval Termine.</p>
|
||||
<p>Der erste definiert sich dadurch das der Termin immer an einem bestimmten Tag im Monat passieren soll. Das Hackspace-Plenum findet z.B. am <code>Zweiten Freitag des Monats</code> statt. Die Sicherheitssprechstunde findet immer am <code>Ersten Dienstag des Monats</code> statt. Anhand dieser Beispiele sollte eigentlich klar sein wie dieses Wiederholungsmuster funktioniert:</p>
|
||||
<p>An erster stelle definiert man die Woche: Erster, Zweiter, Dritter, Letzter (In manchen Fällen kann Dritter und Letzter auch identisch sein).</p>
|
||||
|
||||
<p>Der erste definiert sich dadurch das der Termin immer an einem bestimmten Tag im Monat passieren soll.
|
||||
Das Hackspace-Plenum findet z.B. am „<code>Zweiten Freitag des Monats</code>“ statt. Die
|
||||
Sicherheitssprechstunde findet immer am „<code>Ersten Dienstag des Monats</code>“ statt. Anhand dieser
|
||||
Beispiele sollte eigentlich klar sein wie dieses Wiederholungsmuster funktioniert:</p>
|
||||
|
||||
<p>An erster stelle definiert man die Woche: Erster, Zweiter, Dritter, Letzter (In manchen Fällen kann
|
||||
Dritter und Letzter auch identisch sein).</p>
|
||||
|
||||
<p>An zweiter stelle definiert man den Wochentag: Montag, Dienstag, Mitwoch usw.</p>
|
||||
|
||||
<p>An letzter Stelle steht noch pro Forma „des Monats“</p>
|
||||
<p>Der zweite Wiederholungstyp ist für regelmäßige Termine wie z.B. die Elektrorunde gedacht, die <code>Alle 7 Tage</code>. Für die Brettspielerei würde man <code>Alle 2 Wochen</code> schreiben.</p>
|
||||
|
||||
<p>Der zweite Wiederholungstyp ist für regelmäßige Termine wie z.B. die Elektrorunde gedacht, die „<code>Alle
|
||||
7 Tage</code>“. Für die Brettspielerei würde man „<code>Alle 2 Wochen</code>“ schreiben.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Reference in a new issue