Continued with design: (please cherry-pick)

- added CSS classes table_data_label and table_data_value
- added navigation rule from admin_(un)lock_user to admin_show_user
- also show admin user profile in above pages

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 22bce018fb61e38ef9a620a8964b78c36ba3366d..adfa5e4174fa84bce065154a747f0738215b3511 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -403,6 +403,20 @@
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_lock.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_unlock.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</from-view-id>
                <navigation-case>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index feafc822dba43fac5945201bd9410e8f04407ad2..f3a1867dd6d3fc635272023e8bdd493a5e2c998e 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -32,42 +32,54 @@
                                        </div>
 
                                        <div class="para">
-                                               <div>
+                                               <div class="table_data_label">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
+                                               </div>
+
+                                               <div class="table_data_value">
+                                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                                       </h:link>
+                                               </div>
+                                       </div>
+
+                                       <div class="para">
+                                               <div class="table_data_label">
                                                        <h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
                                                </div>
 
-                                               <div>
+                                               <div class="table_data_value">
                                                        <h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
                                                </div>
                                        </div>
 
                                        <div class="para">
-                                               <div>
+                                               <div class="table_data_label">
                                                        <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                                </div>
 
-                                               <div>
+                                               <div class="table_data_value">
                                                        <h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                                </div>
                                        </div>
 
                                        <div class="para">
-                                               <div>
+                                               <div class="table_data_label">
                                                        <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                                </div>
 
-                                               <div>
+                                               <div class="table_data_value">
                                                        <h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                                </div>
                                        </div>
 
                                        <div class="para">
-                                               <div>
+                                               <div class="table_data_label">
                                                        <h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
                                                </div>
 
-                                               <div>
-                                                       <h:outputText value="#{adminUserController.userLockReason}" />
+                                               <div class="table_data_value">
+                                                       <h:outputText id="userLockReason" value="#{adminUserController.userLockReason}" />
                                                </div>
                                        </div>
 

diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 1c1e9bb7a2fc76ea506ff3aa3c96b260e4e0b84a..84d84f6c1607908fb212b80789182677ba6d4ec7 100644 (file)
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -160,6 +160,24 @@ ul.footer_nav li.footer_copyright {
        font-weight: bold;
 }
 
+.table_data_label {
+       font-weight: bold;
+       background-image: linear-gradient(#eeeeee, #bbbbbb);
+       border: 1px solid #aaaaaa;
+       height: 16px;
+       padding-left: 2px;
+}
+
+.table_data_value {
+       border: 1px solid #aaaaaa;
+       padding-top: 1px;
+       padding-bottom: 1px;
+       padding-left: 2px;
+       padding-right: 1px;
+       margin-top: 2px;
+       min-height: 14px;
+}
+
 #content_header {
        background-color: #dddddd;
        font-weight: bold;