From: Roland Häder Date: Mon, 8 Aug 2016 14:51:58 +0000 (+0200) Subject: Continued with rewrite: (please cherry-pick) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=925dc37ff75c652db4b5c36ed59e7748c15fb52a;p=jfinancials-war.git Continued with rewrite: (please cherry-pick) - renamed some admin_contact_cellphone_???.xhtml to admin_cellphone_???.xhtml as they are generic enough (not depending on contact) - moved phone-contact stuff to adminContactController - renamed i18n strings properly - no need to have contact in adminPhoneController, better is the obvious one: beanHelper - started with listing all cell phone numbers (similar JSF will follow for land-line and fax numbers) - the contact stuff in adminPhoneHelper was deprecated anyway Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 2c9cd953..5e41b4bd 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,74 +2,77 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index b7cd38d8..552bd308 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -19,8 +19,11 @@ package org.mxchange.addressbook.beans.contact; import java.text.MessageFormat; import java.util.Collections; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Objects; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; @@ -33,6 +36,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; +import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestController; import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; @@ -50,6 +54,7 @@ import org.mxchange.jphone.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote; import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; @@ -72,6 +77,17 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController */ private static final long serialVersionUID = 542_145_347_916L; + /** + * Remote EJB for phone number (administrative) + */ + private AdminPhoneSessionBeanRemote adminPhoneBean; + + /** + * Administrative phone controller + */ + @Inject + private AddressbookAdminPhoneWebRequestController adminPhoneController; + /** * Birth day */ @@ -87,6 +103,11 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController */ private Long cellphoneNumber; + /** + * All cell phone numbers + */ + private final List cellphoneNumbers; + /** * City */ @@ -105,7 +126,13 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController /** * Contact list */ - private List contactList; + private final List contactList; + + /** + * "Cache" for contact lists, mostly only one is assigned. So this cache + * shouldn't grow beyond control. + */ + private final Map> contacts; /** * Country instance @@ -120,7 +147,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController /** * Email address list */ - private List emailAddressList; + private final List emailAddressList; /** * Email address repeated @@ -240,10 +267,19 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController // Try to lookup this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + + // Try to lookup the beans + this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminphone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); } + + // Init lists/maps + this.cellphoneNumbers = new LinkedList<>(); + this.contacts = new HashMap<>(10); + this.contactList = new LinkedList<>(); + this.emailAddressList = new LinkedList<>(); } @Override @@ -429,6 +465,36 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController this.copyContact(event.getLoggedInUser().getUserContact()); } + @Override + public List allCellphoneContacts () { + // Get id + Long phoneId = this.adminPhoneController.getCellPhone().getPhoneId(); + + // Is cache there? + if (this.contacts.containsKey(phoneId)) { + // Return cached version + return this.contacts.get(phoneId); + } else { + // Ask bean + List list = new LinkedList<>(); + + // "Walk" through all contacts + for (final Contact contact : this.contactList) { + // Is cellphone instance the same? + if (Objects.equals(contact.getContactCellphoneNumber(), this.adminPhoneController.getCellPhone())) { + // Found one + list.add(contact); + } + } + + // Store result in cache + this.contacts.put(phoneId, list); + + // Return now-cached list + return list; + } + } + @Override public List allContacts () { // Debug message @@ -830,10 +896,10 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController @PostConstruct public void init () { // Get full email address list for reducing EJB calls - this.emailAddressList = this.contactBean.getEmailAddressList(); + this.emailAddressList.addAll(this.contactBean.getEmailAddressList()); // Get full contact list - this.contactList = this.contactBean.getAllContacts(); + this.contactList.addAll(this.contactBean.getAllContacts()); // Get all users List allUsers = this.userController.allUsers(); @@ -868,6 +934,9 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController // Set contact list this.selectableContacts = allContacts; + + // All phone numbers + this.cellphoneNumbers.addAll(this.adminPhoneBean.allCellphoneNumbers()); } @Override diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java index 532b232c..1c81637a 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java @@ -19,6 +19,7 @@ package org.mxchange.addressbook.beans.contact; import java.io.Serializable; import java.util.Date; import java.util.List; +import javax.ejb.Local; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; @@ -37,6 +38,7 @@ import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; *

* @author Roland Haeder */ +@Local public interface AddressbookContactWebSessionController extends Serializable { /** @@ -51,6 +53,13 @@ public interface AddressbookContactWebSessionController extends Serializable { */ List allContacts (); + /** + * Getter for all contacts having current cellphone instance linked + *

+ * @return List of all linked contacts + */ + List allCellphoneContacts (); + /** * Checks whether there are contacts. *

diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java index 97b2aa3b..3ad2697e 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java @@ -16,9 +16,6 @@ */ package org.mxchange.addressbook.beans.phone; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Named; @@ -26,7 +23,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; @@ -49,30 +45,13 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll /** * Remote EJB for phone number (administrative) */ - private AdminContactsPhoneSessionBeanRemote adminRemoteBean; + private AdminContactsPhoneSessionBeanRemote adminPhoneBean; /** * Cell phone number */ private DialableCellphoneNumber cellPhone; - /** - * Instance of linked contact account - *

- * @deprecated This is a generic phone controller, not just for contact data - */ - @Deprecated - private Contact contact; - - /** - * "Cache" for contact lists, mostly only one is assigned. So this cache - * shouldn't grow beyond control. - *

- * @deprecated This is a generic phone controller, not just for contact data - */ - @Deprecated - private final Map> contacts; - /** * Fax number */ @@ -93,36 +72,11 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll Context context = new InitialContext(); // Try to lookup the beans - this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N + this.adminPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); } - - // Init map - this.contacts = new HashMap<>(10); - } - - @Override - @Deprecated - public List allCellphoneContacts () { - // Get id - Long phoneId = this.getCellPhone().getPhoneId(); - - // Is cache there? - if (this.contacts.containsKey(phoneId)) { - // Return cached version - return this.contacts.get(phoneId); - } else { - // Ask bean - List list = this.adminRemoteBean.allContacts(this.getCellPhone()); - - // Store result in cache - this.contacts.put(phoneId, list); - - // Return now-cached list - return list; - } } @Override @@ -135,18 +89,6 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll this.cellPhone = cellPhone; } - @Override - @Deprecated - public Contact getContact () { - return this.contact; - } - - @Override - @Deprecated - public void setContact (final Contact contact) { - this.contact = contact; - } - @Override public DialableFaxNumber getFax () { return this.fax; diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java index c4d0b84c..a0ef0249 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java @@ -17,8 +17,7 @@ package org.mxchange.addressbook.beans.phone; import java.io.Serializable; -import java.util.List; -import org.mxchange.jcontacts.contact.Contact; +import javax.ejb.Local; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; @@ -29,16 +28,9 @@ import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; *

* @author Roland Haeder */ +@Local public interface AddressbookAdminPhoneWebRequestController extends Serializable { - /** - * Getter for all contacts having current cellphone instance linked - *

- * @return List of all linked contacts - */ - @Deprecated - List allCellphoneContacts (); - /** * Getter for dialable cellphone number instance *

@@ -81,20 +73,4 @@ public interface AddressbookAdminPhoneWebRequestController extends Serializable */ void setCellPhone (final DialableCellphoneNumber cellPhone); - /** - * Getter for linked contact account - *

- * @return Linked contact account - */ - @Deprecated - Contact getContact (); - - /** - * Setter for linked contact account - *

- * @param contact Linked contact account - */ - @Deprecated - void setContact (final Contact contact); - } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 1aadf343..ec6d229d 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -440,20 +440,20 @@ 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_CELLPHONE=Mobiletelefoneintrag eines Kontaktes l\u00f6schen -CONTENT_TITLE_ADMIN_DELETE_CONTACT_CELLPHONE=Mobiltelefoneintrag eines Kontaktes l\u00f6schen: +CONTENT_TITLE_ADMIN_DELETE_CELLPHONE=Mobiltelefoneintrag eines Kontaktes l\u00f6schen: PAGE_TITLE_ADMIN_EDIT_CELLPHONE=Mobiltelefoneintrag eines Kontaktes editieren -CONTENT_TITLE_ADMIN_EDIT_CONTACT_CELLPHONE=Mobiltelefoneintrag eines Kontaktes editieren: +CONTENT_TITLE_ADMIN_EDIT_CELLPHONE=Mobiltelefoneintrag eines Kontaktes editieren: PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=Eintr\u00e4ge von Mobiletelefonen auflisten -PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Mobiltelefoneintrag eines Kontaktes anzeigen -CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes: +PAGE_TITLE_ADMIN_SHOW_CELLPHONE=Mobiltelefoneintrag eines Kontaktes anzeigen +CONTENT_TITLE_ADMIN_SHOW_CELLPHONE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes: PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon: 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_CONTACT_CELLPHONE=Ein einzelner Mobiltelefoneintrag eines Kontaktes. -TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an. -ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS=Alle Kontakt-Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}: +TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE=Ein einzelner Mobiltelefoneintrag eines Kontaktes. +TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an. +ADMIN_HEADER_SHOW_CELLPHONE_LINKS=Alle Kontakt-Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt. ADMIN_SHOW_CELLPHONE_UNLINK=Trennen: ADMIN_CONTACT_ID=Kontakt-Id: @@ -633,3 +633,4 @@ CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren: ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht gesetzt. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Fehler: Instanz 'contact' im Bean-Helper nicht gesetzt. ERROR_ADMIN_BEAN_CELLPHONE_NUMBER_NOT_SET=Fehler: Instanz 'cellPhone' in administrativer Bean nicht gesetzt. +CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=Mobiltelefonnummern auflisten: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index d2be3817..4b67cae7 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -420,20 +420,20 @@ 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_CELLPHONE=Delete contact's cellphone entry -CONTENT_TITLE_ADMIN_DELETE_CONTACT_CELLPHONE=Delete contact's cellphone entry: +CONTENT_TITLE_ADMIN_DELETE_CELLPHONE=Delete contact's cellphone entry: PAGE_TITLE_ADMIN_EDIT_CELLPHONE=Edit contact's cellphone entry -CONTENT_TITLE_ADMIN_EDIT_CONTACT_CELLPHONE=Edit contact's cellphone entry: +CONTENT_TITLE_ADMIN_EDIT_CELLPHONE=Edit contact's cellphone entry: PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List all cellphone entries -PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Show contact's cellphone entry -CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Show contact's cellphone entry: +PAGE_TITLE_ADMIN_SHOW_CELLPHONE=Show contact's cellphone entry +CONTENT_TITLE_ADMIN_SHOW_CELLPHONE=Show contact's cellphone entry: PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link contact-cellphone CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link between contact-cellphone: 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_CONTACT_CELLPHONE=A single contact's cellphone entry. -TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS=This table shows links of of this cellphone number to all contacts. -ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS=All links between contact-cellphone for id {0}: +TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE=A single contact's cellphone entry. +TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS=This table shows links of of this cellphone number to all contacts. +ADMIN_HEADER_SHOW_CELLPHONE_LINKS=All links between contact-cellphone for id {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set. ADMIN_SHOW_CELLPHONE_UNLINK=Unlink: ADMIN_CONTACT_ID=Contact id: @@ -630,3 +630,4 @@ CONTENT_TITLE_ADMIN_LOCK_USER=Lock user account: ERROR_BEAN_HELPER_USER_NOT_SET=Error: Instance 'user' not set in bean helper. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Error: Instance 'contact' not set in bean helper. ERROR_ADMIN_BEAN_CELLPHONE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in administrative bean not set. +CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List mobile phone numbers: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 74e005b6..240e29e9 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -292,11 +292,11 @@ admin_show_cellphone - /admin/cellphone/admin_contact_cellphone_show.xhtml + /admin/cellphone/admin_cellphone_show.xhtml admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + /admin/cellphone/admin_cellphone_edit.xhtml admin_unlink_contact_cellphone @@ -304,7 +304,7 @@ admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + /admin/cellphone/admin_cellphone_delete.xhtml admin_edit_user diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml new file mode 100644 index 00000000..72a387f4 --- /dev/null +++ b/web/admin/cellphone/admin_cellphone_delete.xhtml @@ -0,0 +1,25 @@ + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE} + + + #{msg.CONTENT_TITLE_ADMIN_DELETE_CELLPHONE} + + + + Here goes your content. + + + diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml new file mode 100644 index 00000000..31a3d1cd --- /dev/null +++ b/web/admin/cellphone/admin_cellphone_edit.xhtml @@ -0,0 +1,25 @@ + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE} + + + #{msg.CONTENT_TITLE_ADMIN_EDIT_CELLPHONE} + + + + Here goes your content. + + + diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml new file mode 100644 index 00000000..e59ccd73 --- /dev/null +++ b/web/admin/cellphone/admin_cellphone_show.xhtml @@ -0,0 +1,92 @@ + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_CELLPHONE} + + + #{msg.CONTENT_TITLE_ADMIN_SHOW_CELLPHONE} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+
    +
  • + + + + + +
    • +
+
+ + + + + diff --git a/web/admin/cellphone/admin_contact_cellphone_delete.xhtml b/web/admin/cellphone/admin_contact_cellphone_delete.xhtml deleted file mode 100644 index 2261c4e0..00000000 --- a/web/admin/cellphone/admin_contact_cellphone_delete.xhtml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE} - - - #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT_CELLPHONE} - - - - Here goes your content. - - - diff --git a/web/admin/cellphone/admin_contact_cellphone_edit.xhtml b/web/admin/cellphone/admin_contact_cellphone_edit.xhtml deleted file mode 100644 index 95939c28..00000000 --- a/web/admin/cellphone/admin_contact_cellphone_edit.xhtml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE} - - - #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT_CELLPHONE} - - - - Here goes your content. - - - diff --git a/web/admin/cellphone/admin_contact_cellphone_list.xhtml b/web/admin/cellphone/admin_contact_cellphone_list.xhtml index 5ba61eba..e3e4aa93 100644 --- a/web/admin/cellphone/admin_contact_cellphone_list.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_list.xhtml @@ -15,7 +15,13 @@ - Here goes your content. + + + + + + + diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml deleted file mode 100644 index 0c433743..00000000 --- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE} - - - #{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    -
  • - - - - - -
    • -
-
- - - - - diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml index 0b71610b..715d7bc9 100644 --- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml @@ -9,7 +9,7 @@ - +