From 264114fa5db5a0f2a3c1a5eae5320a31c83dbd37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Aug 2016 12:09:28 +0200 Subject: [PATCH] Continued with fax, land-line, mobile: (please cherry-pick) - added getter/setter for choosen fax/land-line numbers - added template includes for fax/land-line numbers (admin_show_contact) - added created/updated timestamp for fax/land-line/mobile data - added templates for fax/land-line "selection boxes" (input forms, needs renaming) - introduced template admin_user_data.tpl (similar to admin_contact_data.tpl) - fixed "add" EL code for fax/land-line numbers - renamed some i18n strings as they can be combined into a generic "Administrative links" string - added missing i18n strings - added suffix _NUMBER to i18n strings as they are about ("phone") numbers ... MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../phone/JobsAdminPhoneWebRequestBean.java | 15 ++ .../JobsAdminPhoneWebRequestController.java | 26 ++- .../localization/bundle_de_DE.properties | 22 ++- .../localization/bundle_en_US.properties | 22 ++- .../admin/contact/admin_contact_data_mini.tpl | 20 --- .../templates/admin/fax/admin_fax_data.tpl | 18 +- .../admin/fax/admin_form_add_contact_fax.tpl | 8 +- .../admin/fax/admin_form_fax_data.tpl | 16 +- .../admin_form_add_contact_landline.tpl | 8 +- .../landline/admin_form_landline_data.tpl | 16 +- .../admin/landline/admin_landline_data.tpl | 18 +- .../mobile/admin_form_add_contact_mobile.tpl | 6 +- .../admin/mobile/admin_mobile_data.tpl | 18 +- .../templates/admin/user/admin_user_data.tpl | 164 ++++++++++++++++++ .../templates/generic/fax_selection_box.tpl | 25 +++ .../generic/landline_selection_box.tpl | 25 +++ web/admin/contact/admin_contact_show.xhtml | 12 +- web/admin/fax/admin_fax_show.xhtml | 2 +- web/admin/landline/admin_landline_show.xhtml | 2 +- web/admin/mobile/admin_mobile_show.xhtml | 2 +- web/admin/user/admin_user_show.xhtml | 157 +---------------- 21 files changed, 365 insertions(+), 237 deletions(-) create mode 100644 web/WEB-INF/templates/admin/user/admin_user_data.tpl create mode 100644 web/WEB-INF/templates/generic/fax_selection_box.tpl create mode 100644 web/WEB-INF/templates/generic/landline_selection_box.tpl diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 636675a3..cb625680 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -72,6 +72,11 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements @Inject private JobsWebRequestController beanHelper; + /** + * Choosen fax number + */ + private DialableFaxNumber choosenFaxNumber; + /** * Choosen land-line number */ @@ -306,6 +311,16 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements return "admin_edit_mobile?faces-redirect=true&includeViewParams=true"; //NOI18N } + @Override + public DialableFaxNumber getChoosenFaxNumber () { + return this.choosenFaxNumber; + } + + @Override + public void setChoosenFaxNumber (final DialableFaxNumber choosenFaxNumber) { + this.choosenFaxNumber = choosenFaxNumber; + } + @Override public DialableLandLineNumber getChoosenLandLineNumber () { return this.choosenLandLineNumber; diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java index 194fb02c..45522ccc 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java @@ -84,18 +84,18 @@ public interface JobsAdminPhoneWebRequestController extends Serializable { void setMobileProvider (final MobileProvider mobileProvider); /** - * Getter for choosen mobile number + * Getter for choosen fax number *

- * @return Choosen mobile number + * @return Choosen fax number */ - DialableMobileNumber getChoosenMobileNumber (); + DialableFaxNumber getChoosenFaxNumber (); /** - * Setter for choosen mobile number + * Setter for choosen fax number *

- * @param choosenMobileNumber Choosen mobile number + * @param choosenFaxNumber Choosen fax number */ - void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber); + void setChoosenFaxNumber (final DialableFaxNumber choosenFaxNumber); /** * Getter for choosen land-line number @@ -111,6 +111,20 @@ public interface JobsAdminPhoneWebRequestController extends Serializable { */ void setChoosenLandLineNumber (final DialableLandLineNumber choosenLandLineNumber); + /** + * Getter for choosen mobile number + *

+ * @return Choosen mobile number + */ + DialableMobileNumber getChoosenMobileNumber (); + + /** + * Setter for choosen mobile number + *

+ * @param choosenMobileNumber Choosen mobile number + */ + void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber); + /** * Getter for mobile number *

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 241df305..d8c0bb50 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -396,7 +396,7 @@ ADMIN_HEADER_SHOW_MOBILE_DATA=Daten des Mobiltelefons: ADMIN_SHOW_PHONE_ID=Id-Nummer: ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter: ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer: -ADMIN_SHOW_MOBILE_LINKS=Administrative Links: +ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links: ERROR_PARAMETER_USER_NOT_SET=Fehler: Parameter 'user' nicht gesetzt. ADMIN_LINK_SHOW_SHORT=Anzeigen ADMIN_LINK_SHOW_SHORT_TITLE=Eintrag einzelnt anzeigen. @@ -418,7 +418,7 @@ ERROR_PARAMETER_PHONE_ID_NOT_SET=Fehler: Parameter 'phoneId' ist nicht gesetzt. PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen: TABLE_SUMMARY_ADMIN_SHOW_MOBILE=Ein einzelner Mobiletelefoneintrag. -TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an. +TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an. ADMIN_HEADER_SHOW_MOBILE_LINKS=Alle Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt. ADMIN_SHOW_MOBILE_UNLINK=Trennen: @@ -641,9 +641,9 @@ ERROR_USER_NAME_ALREADY_USED=Benutzername bereits verwendet. Bitte geben Sie ein ERROR_EMAIL_ADDRESSES_MISMATCHING=Die eingegebenen Email-Addressen stimmen nicht \u00fcberein. ERROR_EMAIL_ADDRESS_ALREADY_USED=Die eingegebene Email-Adresse wird bereits verwendet und kann nicht erneut verwendet werden. ERROR_MOBILE_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft. -ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Mobilfunknummer einem Kontakt hinzuf\u00fcgen -ADMIN_SELECT_MOBILE=Mobilfunknummer ausw\u00e4hlen: -BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Mobilfunknummer zum Kontakt hinzuf\u00fcgen +ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Mobilfunknummer diesem Kontakt hinzuf\u00fcgen +ADMIN_SELECT_MOBILE_NUMBER=Mobilfunknummer ausw\u00e4hlen: +BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Mobilfunknummer zum Kontakt hinzuf\u00fcgen ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA=... oder neue Mobilfunknummer eingeben: ERROR_USER_EMAIL_ADDRESS_NOT_FOUND=Die eingegebene Email-Addresse konnte nicht gefunden werden. LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS=Festnetznummern ... @@ -661,3 +661,15 @@ CONTENT_TITLE_ADMIN_SHOW_LAND_LINE=Festnetznummer anzeigen: ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET=Fehler: Instanz 'landLine' nicht in Bean-Helper gesetzt. ADMIN_HEADER_SHOW_LAND_LINE_LINKS=Alle Festnetznummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}: ADMIN_LIST_LAND_LINE_EMPTY=Es sind keine Festnetznummern gelistet. +ADMIN_HEADER_SHOW_LAND_LINE_DATA=Daten der Festnetznummer: +ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Vollst\u00e4ndige Festnetznummer: +ADMIN_HEADER_SHOW_FAX_DATA=Daten der Faxnummer: +ADMIN_SHOW_FAX_NUMBER_COMPLETE=Komplette Faxnummer: +ADMIN_SELECT_LAND_LINE_NUMBER=Festnetznummer ausw\u00e4hlen: +ADMIN_SELECT_FAX_NUMBER=Faxnummer ausw\u00e4hlen: +ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA=... oder neue Faxnummer eingeben: +ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA=... oder neue Festznetznummer eingeben: +BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER=Faxnummer zum Kontakt hinzuf\u00fcgen +BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER=Festnetznummer zum Kontakt hinzuf\u00fcgen +ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE=Faxnummer diesem Kontakt hinzuf\u00fcgen +ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE=Festnetznummer diesem Kontakt hinzuf\u00fcgen diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index bdfb5296..ea834155 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -379,7 +379,7 @@ ADMIN_HEADER_SHOW_MOBILE_DATA=Data of mobile phone: ADMIN_SHOW_PHONE_ID=Id number: ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider: ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number: -ADMIN_SHOW_MOBILE_LINKS=Administrative links: +ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links: ERROR_PARAMETER_USER_NOT_SET=Error: Parameter 'user' not set. ADMIN_LINK_SHOW_SHORT=Show ADMIN_LINK_SHOW_SHORT_TITLE=Show single entry. @@ -401,7 +401,7 @@ ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set. PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider: TABLE_SUMMARY_ADMIN_SHOW_MOBILE=A single mobile entry. -TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS=This table shows links of of this mobile number to all contacts. +TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=This table shows links of of this mobile number to all contacts. ADMIN_HEADER_SHOW_MOBILE_LINKS=All links for mobile number id {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set. ADMIN_SHOW_MOBILE_UNLINK=Unlink: @@ -641,9 +641,9 @@ ERROR_USER_NAME_ALREADY_USED=User name already used. Please enter another name. ERROR_EMAIL_ADDRESSES_MISMATCHING=Both entered email addresses are not the same. ERROR_EMAIL_ADDRESS_ALREADY_USED=Your entered email address is already used. Please enter another and try again. ERROR_MOBILE_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}. -ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Add mobile number to contact -ADMIN_SELECT_MOBILE=Choose mobile number: -BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Add mobile number to contact +ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Add mobile number to this contact +ADMIN_SELECT_MOBILE_NUMBER=Choose mobile number: +BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Add mobile number to contact ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA=... or add new mobile number: ERROR_USER_EMAIL_ADDRESS_NOT_FOUND=Your entered email address could not befound. LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS=Land-line numbers ... @@ -661,3 +661,15 @@ CONTENT_TITLE_ADMIN_SHOW_LAND_LINE=Show land-line number: ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET=Error: Instance 'landLine' not set in bean helper. ADMIN_HEADER_SHOW_LAND_LINE_LINKS=All links for land-line number id number {0}: ADMIN_LIST_LAND_LINE_EMPTY=There are no land-line numbers listed. +ADMIN_HEADER_SHOW_LAND_LINE_DATA=Data of land-line number: +ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Complete land-line number: +ADMIN_HEADER_SHOW_FAX_DATA=Data of fax number: +ADMIN_SHOW_FAX_NUMBER_COMPLETE=Complete fax number: +ADMIN_SELECT_LAND_LINE_NUMBER=Choose land-line number: +ADMIN_SELECT_FAX_NUMBER=Choose fax number: +ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA=... or enter new fax number: +ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA=... or enter new land-line number: +BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER=Add fax number to contact +BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER=Add land-line number to contact +ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE=Add fax number to this contact +ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE=Add line-line number to this contact diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl index b4773515..b6f7b738 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl @@ -12,24 +12,12 @@ - - - - - - - - - - - - @@ -41,13 +29,5 @@ - - - - - - - - diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl index c6443840..94f8f4ec 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl @@ -28,8 +28,24 @@ + + + + + + + + + + + + + + + + - +

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index 5b39f4e3..8b1cd7a4 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -10,7 +10,7 @@
- +
@@ -19,14 +19,14 @@
- +
- +
@@ -49,7 +49,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl index 6bfe63d6..f281248d 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl @@ -31,19 +31,9 @@
- - - - - - - - - - - - - + + +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl index 8d5c650f..ed187a1a 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -10,7 +10,7 @@
- +
@@ -19,14 +19,14 @@
- +
- +
@@ -49,7 +49,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl index cd705113..cb9c7bf4 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl @@ -31,19 +31,9 @@
- - - - - - - - - - - - - + + +
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl index 35ce87e1..5d760a9c 100644 --- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl @@ -28,8 +28,24 @@ + + + + + + + + + + + + + + + + - +
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl index 61269e60..bb26071e 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl @@ -10,7 +10,7 @@
- +
@@ -19,7 +19,7 @@
- +
@@ -49,7 +49,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl index 92027f5f..fcdd8c9a 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl @@ -37,8 +37,24 @@ + + + + + + + + + + + + + + + + - +
diff --git a/web/WEB-INF/templates/admin/user/admin_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_user_data.tpl new file mode 100644 index 00000000..16ddc570 --- /dev/null +++ b/web/WEB-INF/templates/admin/user/admin_user_data.tpl @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/generic/fax_selection_box.tpl b/web/WEB-INF/templates/generic/fax_selection_box.tpl new file mode 100644 index 00000000..27e3a4d3 --- /dev/null +++ b/web/WEB-INF/templates/generic/fax_selection_box.tpl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/generic/landline_selection_box.tpl b/web/WEB-INF/templates/generic/landline_selection_box.tpl new file mode 100644 index 00000000..4ce34ff6 --- /dev/null +++ b/web/WEB-INF/templates/generic/landline_selection_box.tpl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index fc7b3abe..ff55a4dd 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -24,13 +24,21 @@ -
+
-
+
+ +
+ +
+ +
+ +
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 4d47d8fe..f8513a3d 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -23,7 +23,7 @@ - + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index 4a9e70a7..e3265fe8 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -23,7 +23,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 04c37ee3..38b3c982 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -23,7 +23,7 @@ - + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index e41e6f3e..69379c9b 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -22,162 +22,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
-- 2.39.5