[mod] link für events berücksichtigen [mod] Wochentage übersetzen
This commit is contained in:
parent
5736e1a5a2
commit
34ec6125c5
7 changed files with 72 additions and 7 deletions
|
@ -46,6 +46,11 @@ namespace _zeitbild.frontend_web.type
|
||||||
|
|
|
|
||||||
string
|
string
|
||||||
);
|
);
|
||||||
|
link : (
|
||||||
|
null
|
||||||
|
|
|
||||||
|
string
|
||||||
|
);
|
||||||
description : (
|
description : (
|
||||||
null
|
null
|
||||||
|
|
|
|
||||||
|
|
|
@ -70,6 +70,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
begin : lib_plankton.pit.type_datetime;
|
begin : lib_plankton.pit.type_datetime;
|
||||||
end : (null | lib_plankton.pit.type_datetime);
|
end : (null | lib_plankton.pit.type_datetime);
|
||||||
location : (null | string);
|
location : (null | string);
|
||||||
|
link : (null | string);
|
||||||
description : (null | string);
|
description : (null | string);
|
||||||
}
|
}
|
||||||
> = new lib_plankton.zoo_form.class_form<
|
> = new lib_plankton.zoo_form.class_form<
|
||||||
|
@ -83,6 +84,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
begin : lib_plankton.pit.type_datetime;
|
begin : lib_plankton.pit.type_datetime;
|
||||||
end : (null | lib_plankton.pit.type_datetime);
|
end : (null | lib_plankton.pit.type_datetime);
|
||||||
location : (null | string);
|
location : (null | string);
|
||||||
|
link : (null | string);
|
||||||
description : (null | string);
|
description : (null | string);
|
||||||
}
|
}
|
||||||
>(
|
>(
|
||||||
|
@ -92,6 +94,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
"begin": value.event_object.begin,
|
"begin": value.event_object.begin,
|
||||||
"end": value.event_object.end,
|
"end": value.event_object.end,
|
||||||
"location": value.event_object.location,
|
"location": value.event_object.location,
|
||||||
|
"link": value.event_object.link,
|
||||||
"description": value.event_object.description,
|
"description": value.event_object.description,
|
||||||
}),
|
}),
|
||||||
(representation) => ({
|
(representation) => ({
|
||||||
|
@ -101,6 +104,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
"begin": representation.begin,
|
"begin": representation.begin,
|
||||||
"end": representation.end,
|
"end": representation.end,
|
||||||
"location": representation.location,
|
"location": representation.location,
|
||||||
|
"link": representation.link,
|
||||||
"description": representation.description,
|
"description": representation.description,
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
@ -166,6 +170,14 @@ namespace _zeitbild.frontend_web.pages
|
||||||
),
|
),
|
||||||
"label": lib_plankton.translate.get("event.location")
|
"label": lib_plankton.translate.get("event.location")
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "link",
|
||||||
|
"input": new lib_plankton.zoo_input.class_input_soft<string>(
|
||||||
|
new lib_plankton.zoo_input.class_input_text(
|
||||||
|
)
|
||||||
|
),
|
||||||
|
"label": lib_plankton.translate.get("event.link")
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "description",
|
"name": "description",
|
||||||
"input": new lib_plankton.zoo_input.class_input_soft<string>(
|
"input": new lib_plankton.zoo_input.class_input_soft<string>(
|
||||||
|
@ -223,6 +235,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
},
|
},
|
||||||
"end": null,
|
"end": null,
|
||||||
"location": null,
|
"location": null,
|
||||||
|
"link": null,
|
||||||
"description": null,
|
"description": null,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
begin : lib_plankton.pit.type_datetime;
|
begin : lib_plankton.pit.type_datetime;
|
||||||
end : (null | lib_plankton.pit.type_datetime);
|
end : (null | lib_plankton.pit.type_datetime);
|
||||||
location : (null | string);
|
location : (null | string);
|
||||||
|
link : (null | string);
|
||||||
description : (null | string);
|
description : (null | string);
|
||||||
}
|
}
|
||||||
> = new lib_plankton.zoo_form.class_form<
|
> = new lib_plankton.zoo_form.class_form<
|
||||||
|
@ -39,6 +40,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
begin : lib_plankton.pit.type_datetime;
|
begin : lib_plankton.pit.type_datetime;
|
||||||
end : (null | lib_plankton.pit.type_datetime);
|
end : (null | lib_plankton.pit.type_datetime);
|
||||||
location : (null | string);
|
location : (null | string);
|
||||||
|
link : (null | string);
|
||||||
description : (null | string);
|
description : (null | string);
|
||||||
}
|
}
|
||||||
>(
|
>(
|
||||||
|
@ -47,6 +49,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
"begin": value.begin,
|
"begin": value.begin,
|
||||||
"end": value.end,
|
"end": value.end,
|
||||||
"location": value.location,
|
"location": value.location,
|
||||||
|
"link": value.link,
|
||||||
"description": value.description,
|
"description": value.description,
|
||||||
}),
|
}),
|
||||||
(representation) => ({
|
(representation) => ({
|
||||||
|
@ -54,6 +57,7 @@ namespace _zeitbild.frontend_web.pages
|
||||||
"begin": representation.begin,
|
"begin": representation.begin,
|
||||||
"end": representation.end,
|
"end": representation.end,
|
||||||
"location": representation.location,
|
"location": representation.location,
|
||||||
|
"link": representation.link,
|
||||||
"description": representation.description,
|
"description": representation.description,
|
||||||
}),
|
}),
|
||||||
new lib_plankton.zoo_input.class_input_group<any>(
|
new lib_plankton.zoo_input.class_input_group<any>(
|
||||||
|
@ -96,6 +100,14 @@ namespace _zeitbild.frontend_web.pages
|
||||||
),
|
),
|
||||||
"label": lib_plankton.translate.get("event.location")
|
"label": lib_plankton.translate.get("event.location")
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "link",
|
||||||
|
"input": new lib_plankton.zoo_input.class_input_soft<string>(
|
||||||
|
new lib_plankton.zoo_input.class_input_text(
|
||||||
|
)
|
||||||
|
),
|
||||||
|
"label": lib_plankton.translate.get("event.link")
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "description",
|
"name": "description",
|
||||||
"input": new lib_plankton.zoo_input.class_input_soft<string>(
|
"input": new lib_plankton.zoo_input.class_input_soft<string>(
|
||||||
|
|
|
@ -144,6 +144,14 @@ namespace _zeitbild.frontend_web.widgets.listview
|
||||||
:
|
:
|
||||||
entry.event_object.location
|
entry.event_object.location
|
||||||
),
|
),
|
||||||
|
"label_link": lib_plankton.translate.get("event.link"),
|
||||||
|
"link": (
|
||||||
|
(entry.event_object.link === null)
|
||||||
|
?
|
||||||
|
"?"
|
||||||
|
:
|
||||||
|
entry.event_object.link
|
||||||
|
),
|
||||||
"label_description": lib_plankton.translate.get("event.description"),
|
"label_description": lib_plankton.translate.get("event.description"),
|
||||||
"description": (
|
"description": (
|
||||||
(entry.event_object.description === null)
|
(entry.event_object.description === null)
|
||||||
|
|
|
@ -7,6 +7,10 @@
|
||||||
<span class="listview-entry-label">{{label_location}}</span>
|
<span class="listview-entry-label">{{label_location}}</span>
|
||||||
<span class="listview-entry-value">{{location}}</span>
|
<span class="listview-entry-value">{{location}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="listview-entry-field listview-entry-link">
|
||||||
|
<span class="listview-entry-label">{{label_link}}</span>
|
||||||
|
<a class="listview-entry-value" href="{{link}}" target="_blank">{{link}}</a>
|
||||||
|
</div>
|
||||||
<!--
|
<!--
|
||||||
<div class="listview-entry-field listview-entry-description">
|
<div class="listview-entry-field listview-entry-description">
|
||||||
<span class="listview-entry-label">{{label_description}}</span>
|
<span class="listview-entry-label">{{label_description}}</span>
|
||||||
|
|
|
@ -208,6 +208,22 @@ namespace _zeitbild.frontend_web.widgets.weekview
|
||||||
:
|
:
|
||||||
""
|
""
|
||||||
)
|
)
|
||||||
|
+
|
||||||
|
(
|
||||||
|
(event_object.link !== null)
|
||||||
|
?
|
||||||
|
(
|
||||||
|
lib_plankton.string.coin(
|
||||||
|
"{{label}}: {{value}}\n",
|
||||||
|
{
|
||||||
|
"label": lib_plankton.translate.get("event.link"),
|
||||||
|
"value": event_object.link,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
:
|
||||||
|
""
|
||||||
|
)
|
||||||
/*
|
/*
|
||||||
+
|
+
|
||||||
(
|
(
|
||||||
|
@ -860,6 +876,13 @@ namespace _zeitbild.frontend_web.widgets.weekview
|
||||||
"label_control_week": lib_plankton.translate.get("widget.weekview.controls.week"),
|
"label_control_week": lib_plankton.translate.get("widget.weekview.controls.week"),
|
||||||
"label_control_count": lib_plankton.translate.get("widget.weekview.controls.count"),
|
"label_control_count": lib_plankton.translate.get("widget.weekview.controls.count"),
|
||||||
"label_control_apply": lib_plankton.translate.get("widget.weekview.controls.apply"),
|
"label_control_apply": lib_plankton.translate.get("widget.weekview.controls.apply"),
|
||||||
|
"label_weekday_monday": lib_plankton.translate.get("common.weekday.monday"),
|
||||||
|
"label_weekday_tuesday": lib_plankton.translate.get("common.weekday.tuesday"),
|
||||||
|
"label_weekday_wednesday": lib_plankton.translate.get("common.weekday.wednesday"),
|
||||||
|
"label_weekday_thursday": lib_plankton.translate.get("common.weekday.thursday"),
|
||||||
|
"label_weekday_friday": lib_plankton.translate.get("common.weekday.friday"),
|
||||||
|
"label_weekday_saturday": lib_plankton.translate.get("common.weekday.saturday"),
|
||||||
|
"label_weekday_sunday": lib_plankton.translate.get("common.weekday.sunday"),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
this.container = target_element.querySelector(".weekview");
|
this.container = target_element.querySelector(".weekview");
|
||||||
|
|
|
@ -19,13 +19,13 @@
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="calendar-cell"></th>
|
<th class="calendar-cell"></th>
|
||||||
<th class="calendar-cell calendar-cell-day">Mo</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_monday}}</th>
|
||||||
<th class="calendar-cell calendar-cell-day">Di</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_tuesday}}</th>
|
||||||
<th class="calendar-cell calendar-cell-day">Mi</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_wednesday}}</th>
|
||||||
<th class="calendar-cell calendar-cell-day">Do</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_thursday}}</th>
|
||||||
<th class="calendar-cell calendar-cell-day">Fr</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_friday}}</th>
|
||||||
<th class="calendar-cell calendar-cell-day">Sa</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_saturday}}</th>
|
||||||
<th class="calendar-cell calendar-cell-day">So</th>
|
<th class="calendar-cell calendar-cell-day">{{label_weekday_sunday}}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
Loading…
Add table
Reference in a new issue