From: Roland Häder Date: Tue, 12 Sep 2017 22:11:58 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3bfa34298d42db7dad39051d59eca36db0e721fa;p=jfinancials-war.git Please cherry-pick: - converted existing "links" templates into custom JSF tags - registered new links taglib and moved existing there - added JSF tag for administrative links to: branch office, mobile provider user (mini links) - some more generic "short" link texts for resending, locking and unlocking Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 0e40781b..3fbc8c46 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -372,13 +372,9 @@ ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter: ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer: ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links: ADMIN_LINK_SHOW_SHORT=Anzeigen -ADMIN_LINK_SHOW_SHORT_TITLE=Eintrag einzelnt anzeigen. ADMIN_LINK_EDIT_SHORT=Editieren -ADMIN_LINK_EDIT_SHORT_TITLE=Eintrag editieren. ADMIN_LINK_DELETE_SHORT=L\u00f6schen -ADMIN_LINK_DELETE_SHORT_TITLE=Eintrag l\u00f6schen. ADMIN_LINK_UNLINK_SHORT=Abtrennen -ADMIN_LINK_UNLINK_SHORT_TITLE=Entfernt Verkn\u00fcpfung zum Eintrag. PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Mobiletelefoneintrag l\u00f6schen CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Mobiletelefoneintrag l\u00f6schen: PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER=Mobiletelefoneintrag editieren @@ -937,3 +933,6 @@ ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edieren von Grunddaten des Unternehmens #@TODO Please fix German umlauts! ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens. ADMIN_ACTION_LINKS=Aktionen: +ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Erneut +ADMIN_LINK_UNLOCK_SHORT=Entsperren +ADMIN_LINK_LOCK_SHORT=Sperren diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index f389354f..44cea70b 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -351,13 +351,9 @@ ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider: ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number: ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links: ADMIN_LINK_SHOW_SHORT=Show -ADMIN_LINK_SHOW_SHORT_TITLE=Show single entry. ADMIN_LINK_EDIT_SHORT=Edit -ADMIN_LINK_EDIT_SHORT_TITLE=Edit entry. ADMIN_LINK_DELETE_SHORT=Delete -ADMIN_LINK_DELETE_SHORT_TITLE=Delete entry. ADMIN_LINK_UNLINK_SHORT=Unlink -ADMIN_LINK_UNLINK_SHORT_TITLE=Removes link to entry. PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Delete mobile entry CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Delete mobile entry: PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER=Edit mobile entry @@ -888,3 +884,6 @@ ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Edit of fax number. ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edit of basic data of company. ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Deletes basic data of company. ADMIN_ACTION_LINKS=Actions: +ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Resend +ADMIN_LINK_UNLOCK_SHORT=Unlock +ADMIN_LINK_LOCK_SHORT=Lock diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml new file mode 100644 index 00000000..09f59252 --- /dev/null +++ b/web/WEB-INF/links.jsf.taglib.xml @@ -0,0 +1,300 @@ + + + + http://mxchange.org/jsf/core/links + + outputUserProfileLink + This tag renders a h:link JSF tag for a user profile. + resources/tags/profile/user/user_profile_link.tpl + + user + An instance of a User class. + true + org.mxchange.jusercore.model.user.User + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputFaxNumberAdminMiniLinks + This tag renders a full h:panelGroup for administrative "mini-links" for fax data. + resources/tags/admin/links/mini/fax/admin_fax_links.tpl + + faxNumber + The fax instance that provides the data for this tag. + true + org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber + + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.model.contact.Contact + + + renderShowLink + Whether this tag is used to show mobile data (default true). + false + java.lang.Boolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputLandLineNumberAdminMiniLinks + This tag renders a full h:panelGroup for administrative "mini-links" for land-line data. + resources/tags/admin/links/mini/landline/admin_landline_links.tpl + + landLineNumber + The fax instance that provides the data for this tag. + true + org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber + + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.model.contact.Contact + + + renderShowLink + Whether this tag is used to show mobile data (default true). + false + java.lang.Boolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputMobileNumberAdminMiniLinks + This tag renders a full h:panelGroup for administrative "mini-links" for mobile data. + resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl + + mobileNumber + The mobile number instance that provides the data for this tag. + true + org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber + + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.model.contact.Contact + + + renderShowLink + Whether this tag is used to show mobile data (default true). + false + java.lang.Boolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputMobileProviderAdminMiniLinks + This tag renders a full h:panelGroup for administrative "mini-links" for mobile provider data. + resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl + + mobileProvider + The mobile provider instance that provides the data for this tag. + true + org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider + + + renderShowLink + Whether this tag is used to show mobile data (default true). + false + java.lang.Boolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputBasicDataAdminMiniLinks + This tag renders administrative "mini-links" for given basicData instance. + resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl + + basicData + The basic company data for this tag. + true + org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData + + + renderShowLink + Whether to render (default: true) "show basic data" link. + false + java.langBoolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputBranchOfficeAdminMiniLinks + This tag renders administrative "mini-links" for given branchOffice instance. + resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl + + branchOffice + The branch office instance that provides the data for this tag. + true + org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice + + + renderShowLink + Whether to render (default: true) "show branch office" link. + false + java.langBoolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputContactAdminMiniLinks + This tag renders administrative "mini-links" for given contact instance. + resources/tags/admin/links/mini/contact/admin_contact_links.tpl + + contact + The contact instance that provides the data for this tag. + true + org.mxchange.jcontacts.model.contact.Contact + + + renderShowLink + Whether to render (default: true) "show contact" link. + false + java.langBoolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputCountryAdminMiniLinks + This tag renders administrative "mini-links" for given country instance. + resources/tags/admin/links/mini/country/admin_country_links.tpl + + country + The country instance that provides the data for this tag. + true + org.mxchange.jcountry.model.data.Country + + + renderShowLink + Whether to render (default: true) "show branch office" link. + false + java.langBoolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputUserAdminMiniLinks + This tag renders administrative "mini-links" for given user instance. + resources/tags/admin/links/mini/user/admin_user_links.tpl + + user + The user instance that provides the data for this tag. + true + org.mxchange.jusercore.model.user.User + + + renderShowLink + Whether to render (default: true) "show user" link. + false + java.langBoolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputUserAdminLinks + This tag renders administrative links for given user instance. + resources/tags/admin/links/user/admin_user_links.tpl + + user + The user instance that provides the data for this tag. + true + org.mxchange.jusercore.model.user.User + + + renderShowLink + Whether to render (default: true) "show user" link. + false + java.langBoolean + + + renderContactLinks + Whether to render (default: false) contact links. + false + java.langBoolean + + + renderHeader + Whether to render (default: false) table header. + false + java.langBoolean + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + diff --git a/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl deleted file mode 100644 index 10c6b8c6..00000000 --- a/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - diff --git a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl deleted file mode 100644 index ec4645b1..00000000 --- a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl deleted file mode 100644 index e047f651..00000000 --- a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - diff --git a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl new file mode 100644 index 00000000..10c6b8c6 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl @@ -0,0 +1,32 @@ + + + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl new file mode 100644 index 00000000..0ed7ad15 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl @@ -0,0 +1,32 @@ + + + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl new file mode 100644 index 00000000..ed70e299 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl @@ -0,0 +1,41 @@ + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl new file mode 100644 index 00000000..db19df5b --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl @@ -0,0 +1,43 @@ + + + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl new file mode 100644 index 00000000..ad4afd00 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl @@ -0,0 +1,41 @@ + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl new file mode 100644 index 00000000..61071686 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl @@ -0,0 +1,31 @@ + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl new file mode 100644 index 00000000..9d7c2900 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl @@ -0,0 +1,53 @@ + + + + + + + + + +
    + +
  • + + + +
  • +
    + +
  • + + + +
  • + +
  • + + + + + + + + + + + + +
  • + +
  • + + + + +
  • +
+
+
+
diff --git a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl deleted file mode 100644 index 26ee5a28..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl new file mode 100644 index 00000000..8b4f0cc1 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl @@ -0,0 +1,75 @@ + + + + + + + + + +
    + +
  • + + + +
  • +
    + +
  • + + + +
  • + + +
  • + + + +
  • +
    + +
  • + + + + + + + + + + + + +
  • + +
  • + + + + +
  • + + +
  • + + + +
  • +
    + +
  • + + + +
  • +
+
+
+
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl index bc0dd680..197917c6 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl @@ -2,6 +2,7 @@ @@ -43,11 +44,11 @@ - +
- +
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl index 69febe51..e7a75daa 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl @@ -2,6 +2,7 @@ @@ -43,11 +44,11 @@
- +
- +
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl index ec622509..616f8917 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl @@ -2,6 +2,7 @@ @@ -52,11 +53,11 @@
- +
- +
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl deleted file mode 100644 index 907110d7..00000000 --- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - -
- -
- - -
    -
  • - - - -
  • - -
  • - - - - -
  • -
-
-
-
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl deleted file mode 100644 index a95ef3c6..00000000 --- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - -
- -
- - -
    -
  • - - - -
  • - -
  • - - - -
  • - -
  • - - - - - - - - - - - -
  • - -
  • - - - - -
  • - -
  • - - - -
  • - -
  • - - - -
  • -
-
-
-
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 3c1562d6..98120891 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -10,7 +10,7 @@ Generic custom JSF tags library javax.faces.FACELETS_LIBRARIES - /WEB-INF/widgets.jsf.taglib.xml + /WEB-INF/widgets.jsf.taglib.xml;/WEB-INF/links.jsf.taglib.xml Project stage diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml index 02d2aca3..e6704a5e 100644 --- a/web/WEB-INF/widgets.jsf.taglib.xml +++ b/web/WEB-INF/widgets.jsf.taglib.xml @@ -206,23 +206,12 @@ along with this program. If not, see . java.lang.String - - outputUserProfileLink - This tag renders a h:link JSF tag for a user profile. - resources/tags/profile/user/user_profile_link.tpl - - user - An instance of a User class. - true - org.mxchange.jusercore.model.user.User - - outputAdminFaxPanelGrid This tag renders a full h:panelGrid for administrative purposes for fax data. resources/tags/admin/panel_grids/fax/admin_fax_data.tpl - isShowPage + renderShowLink Whether this tag is used to show mobile data (default true). false java.lang.Boolean @@ -246,7 +235,7 @@ along with this program. If not, see . java.lang.Boolean - showAdminLinks + showAdminMiniLinks Whether to show administrative links to other pages (default: true). false java.lang.Boolean @@ -257,7 +246,7 @@ along with this program. If not, see . This tag renders a full h:panelGrid for administrative purposes for land-line data. resources/tags/admin/panel_grids/landline/admin_landline_data.tpl - isShowPage + renderShowLink Whether this tag is used to show mobile data (default true). false java.lang.Boolean @@ -281,7 +270,7 @@ along with this program. If not, see . java.lang.Boolean - showAdminLinks + showAdminMiniLinks Whether to show administrative links to other pages (default: true). false java.lang.Boolean @@ -292,7 +281,7 @@ along with this program. If not, see . This tag renders a full h:panelGrid for administrative purposes for mobile data. resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl - isShowPage + renderShowLink Whether this tag is used to show mobile data (default true). false java.lang.Boolean @@ -316,7 +305,7 @@ along with this program. If not, see . java.lang.Boolean - showAdminLinks + showAdminMiniLinks Whether to show administrative links to other pages (default: true). false java.lang.Boolean @@ -370,114 +359,4 @@ along with this program. If not, see . java.lang.Boolean - - outputAdminFaxLinks - This tag renders a full h:panelGroup for administrative links for fax data. - resources/tags/admin/links/fax/admin_fax_data.tpl - - isShowPage - Whether this tag is used to show mobile data (default true). - false - java.lang.Boolean - - - faxNumber - The fax instance that provides the data for this tag. - true - org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber - - - contact - The contact instance that provides contact data for additional JSF links. - false - org.mxchange.jcontacts.model.contact.Contact - - - rendered - Whether this tag is being rendered by JSF engine. - false - java.lang.Boolean - - - - outputAdminLandLineLinks - This tag renders a full h:panelGroup for administrative links for land-line data. - resources/tags/admin/panel_grids/landline/admin_landline_data.tpl - - isShowPage - Whether this tag is used to show mobile data (default true). - false - java.lang.Boolean - - - landLineNumber - The fax instance that provides the data for this tag. - true - org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber - - - contact - The contact instance that provides contact data for additional JSF links. - false - org.mxchange.jcontacts.model.contact.Contact - - - rendered - Whether this tag is being rendered by JSF engine. - false - java.lang.Boolean - - - - outputAdminMobileLinks - This tag renders a full h:panelGroup for administrative links for mobile data. - resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl - - isShowPage - Whether this tag is used to show mobile data (default true). - false - java.lang.Boolean - - - mobileNumber - The mobile instance that provides the data for this tag. - true - org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber - - - contact - The contact instance that provides contact data for additional JSF links. - false - org.mxchange.jcontacts.model.contact.Contact - - - rendered - Whether this tag is being rendered by JSF engine. - false - java.lang.Boolean - - - - outputBasicDataAdminLinks - This tag renders administrative links for given basicData instance. - resources/tags/admin/links/basic_data/admin_basic_data_links.tpl - - basicData - The mobile instance that provides the data for this tag. - true - - - - renderShowLink - Whether to render (default: yes) "show basic data" link. - false - java.langBoolean - - - rendered - Whether this tag is being rendered by JSF engine. - false - java.lang.Boolean - - diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml index f993a082..422a93d3 100644 --- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml +++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml @@ -2,6 +2,7 @@ @@ -97,7 +98,7 @@ - +
diff --git a/web/admin/branch_offices/admin_branch_offices_list.xhtml b/web/admin/branch_offices/admin_branch_offices_list.xhtml index f432dd86..0a5e5b41 100644 --- a/web/admin/branch_offices/admin_branch_offices_list.xhtml +++ b/web/admin/branch_offices/admin_branch_offices_list.xhtml @@ -2,6 +2,7 @@ @@ -95,6 +96,14 @@ + + + + + + + + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 2a04a577..286769a3 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -2,6 +2,7 @@ @@ -69,6 +70,14 @@ + + + + + + + + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 810e2310..6014cdc5 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -2,6 +2,7 @@ @@ -30,7 +31,7 @@ - + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 402bde6b..ea9d0a86 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -45,7 +45,7 @@
- +
- +
- +
- +
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 4fdeb105..56886416 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index 3b6c6bd6..d9d2955c 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -31,7 +31,7 @@
- +
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index 78d25c66..f535c30b 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -31,7 +31,7 @@
- +
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 1edd06f9..78415944 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index e04645aa..270a7a5c 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -1,6 +1,7 @@ @@ -14,14 +15,14 @@ - + - - + + @@ -30,7 +31,7 @@ - + @@ -38,7 +39,7 @@ - + @@ -46,7 +47,7 @@ - + @@ -54,10 +55,18 @@ - + + + + + + + + + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 4b3f72a3..d3c5660c 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -2,6 +2,7 @@ @@ -87,6 +88,14 @@ + + + + + + + + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index 37c80d32..f7bc6033 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -2,6 +2,7 @@ @@ -27,7 +28,7 @@ - + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index b1726a33..a2fc13bf 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -2,6 +2,7 @@ @@ -29,7 +30,7 @@ - +