inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated MyFaces source code, fixed warning from HtmlRenderer and fixed selector issues in portal

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-01-31 10:00:33 +00:00
parent 3e2bfc8902
commit dd95515b5f
20 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
View File

@@ -203,7 +203,10 @@ public class RichListRenderer extends BaseRenderer
if (header != null) if (header != null)
{ {
header.encodeBegin(context); header.encodeBegin(context);
if (header.getRendersChildren())
{
header.encodeChildren(context); header.encodeChildren(context);
}
header.encodeEnd(context); header.encodeEnd(context);
} }
@@ -266,7 +269,10 @@ public class RichListRenderer extends BaseRenderer
if (smallIcon != null) if (smallIcon != null)
{ {
smallIcon.encodeBegin(context); smallIcon.encodeBegin(context);
if (smallIcon.getRendersChildren())
{
smallIcon.encodeChildren(context); smallIcon.encodeChildren(context);
}
smallIcon.encodeEnd(context); smallIcon.encodeEnd(context);
out.write(" "); out.write(" ");
} }
@@ -349,7 +355,7 @@ public class RichListRenderer extends BaseRenderer
public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns) public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
throws IOException throws IOException
{ {
ResponseWriter out = context.getResponseWriter(); // ResponseWriter out = context.getResponseWriter();
// render column headers as labels // render column headers as labels
// TODO: add "showHeaders" to RichList to allow hiding of header facets for some view modes // TODO: add "showHeaders" to RichList to allow hiding of header facets for some view modes
@@ -446,7 +452,10 @@ public class RichListRenderer extends BaseRenderer
if (icon != null) if (icon != null)
{ {
icon.encodeBegin(context); icon.encodeBegin(context);
if (icon.getRendersChildren())
{
icon.encodeChildren(context); icon.encodeChildren(context);
}
icon.encodeEnd(context); icon.encodeEnd(context);
} }
out.write("</td>"); out.write("</td>");
@@ -646,7 +655,10 @@ public class RichListRenderer extends BaseRenderer
if (largeIcon != null) if (largeIcon != null)
{ {
largeIcon.encodeBegin(context); largeIcon.encodeBegin(context);
if (largeIcon.getRendersChildren())
{
largeIcon.encodeChildren(context); largeIcon.encodeChildren(context);
}
largeIcon.encodeEnd(context); largeIcon.encodeEnd(context);
} }
out.write("</td>"); out.write("</td>");

2
source/web/jsp/dialog/checkout-file.jsp
View File

@@ -148,7 +148,7 @@
<tr> <tr>
<td style="padding-left:26px"> <td style="padding-left:26px">
<%-- Space selector to allow user to pick a Space --%> <%-- Space selector to allow user to pick a Space --%>
<r:spaceSelector label="#{msg.select_space_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_space_prompt}"
value="#{CheckinCheckoutBean.selectedSpaceId}" value="#{CheckinCheckoutBean.selectedSpaceId}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

6
source/web/jsp/dialog/edit-category.jsp
View File

@@ -100,13 +100,15 @@
<tr> <tr>
<td><h:outputText value="#{msg.categories}" />:</td> <td><h:outputText value="#{msg.categories}" />:</td>
<td width="98%"> <td width="98%">
<r:multiValueListEditor value="#{DocumentDetailsBean.categories}" <r:multiValueListEditor id="multi-category-selector"
value="#{DocumentDetailsBean.categories}"
lastItemAdded="#{DocumentDetailsBean.addedCategory}" lastItemAdded="#{DocumentDetailsBean.addedCategory}"
selectItemMsg="#{msg.select_category}" selectItemMsg="#{msg.select_category}"
selectedItemsMsg="#{msg.selected_categories}" selectedItemsMsg="#{msg.selected_categories}"
noSelectedItemsMsg="#{msg.no_selected_categories}" noSelectedItemsMsg="#{msg.no_selected_categories}"
styleClass="selector"> styleClass="selector">
<r:categorySelector label="#{msg.select_category_prompt}" styleClass="selector" <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}"
styleClass="selector"
value="#{DocumentDetailsBean.addedCategory}"/> value="#{DocumentDetailsBean.addedCategory}"/>
</r:multiValueListEditor> </r:multiValueListEditor>
</td> </td>

2
source/web/jsp/wizard/create-action/action-check-out.jsp
View File

@@ -118,7 +118,7 @@
<tr> <tr>
<td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td> <td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td>
<td width="100%"> <td width="100%">
<r:spaceSelector label="#{msg.select_checkout_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_checkout_prompt}"
value="#{NewActionWizard.actionProperties.destinationLocation}" value="#{NewActionWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/create-action/action-copy.jsp
View File

@@ -118,7 +118,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td width="90%"> <td width="90%">
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewActionWizard.actionProperties.destinationLocation}" value="#{NewActionWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/create-action/action-import.jsp
View File

@@ -118,7 +118,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td width="90%"> <td width="90%">
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewActionWizard.actionProperties.destinationLocation}" value="#{NewActionWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
style="border: 1px dashed #cccccc; padding: 6px;"/> style="border: 1px dashed #cccccc; padding: 6px;"/>

2
source/web/jsp/wizard/create-action/action-link-category.jsp
View File

@@ -118,7 +118,7 @@
<tr> <tr>
<td valign="top"><h:outputText value="#{msg.category}"/>:</td> <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
<td width="90%"> <td width="90%">
<r:categorySelector label="#{msg.select_category_prompt}" <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}"
value="#{NewActionWizard.actionProperties.category}" value="#{NewActionWizard.actionProperties.category}"
styleClass="selector"/> styleClass="selector"/>
</td> </td>

2
source/web/jsp/wizard/create-action/action-move.jsp
View File

@@ -118,7 +118,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td width="90%"> <td width="90%">
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewActionWizard.actionProperties.destinationLocation}" value="#{NewActionWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/create-action/action-transform-image.jsp
View File

@@ -133,7 +133,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td> <td>
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewActionWizard.actionProperties.destinationLocation}" value="#{NewActionWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/create-action/action-transform.jsp
View File

@@ -127,7 +127,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td> <td>
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewActionWizard.actionProperties.destinationLocation}" value="#{NewActionWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/new-rule/action-check-out.jsp
View File

@@ -106,7 +106,7 @@
<tr> <tr>
<td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td> <td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td>
<td width="100%"> <td width="100%">
<r:spaceSelector label="#{msg.select_checkout_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_checkout_prompt}"
value="#{NewRuleWizard.actionProperties.destinationLocation}" value="#{NewRuleWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/new-rule/action-copy.jsp
View File

@@ -106,7 +106,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td width="90%"> <td width="90%">
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewRuleWizard.actionProperties.destinationLocation}" value="#{NewRuleWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

3
source/web/jsp/wizard/new-rule/action-import.jsp
View File

@@ -106,7 +106,8 @@
<tr> <tr>
<td><h:outputText value="#{msg.import_to}"/>:</td> <td><h:outputText value="#{msg.import_to}"/>:</td>
<td width="90%"> <td width="90%">
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="category-selector"
label="#{msg.select_destination_prompt}"
value="#{NewRuleWizard.actionProperties.destinationLocation}" value="#{NewRuleWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
style="border: 1px dashed #cccccc; padding: 6px;"/> style="border: 1px dashed #cccccc; padding: 6px;"/>

2
source/web/jsp/wizard/new-rule/action-link-category.jsp
View File

@@ -106,7 +106,7 @@
<tr> <tr>
<td valign="top"><h:outputText value="#{msg.category}"/>:</td> <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
<td width="90%"> <td width="90%">
<r:categorySelector label="#{msg.select_category_prompt}" <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}"
value="#{NewRuleWizard.actionProperties.category}" value="#{NewRuleWizard.actionProperties.category}"
styleClass="selector"/> styleClass="selector"/>
</td> </td>

2
source/web/jsp/wizard/new-rule/action-move.jsp
View File

@@ -106,7 +106,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td width="90%"> <td width="90%">
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewRuleWizard.actionProperties.destinationLocation}" value="#{NewRuleWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/new-rule/action-transform-image.jsp
View File

@@ -121,7 +121,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td> <td>
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewRuleWizard.actionProperties.destinationLocation}" value="#{NewRuleWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/new-rule/action-transform.jsp
View File

@@ -115,7 +115,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.destination}"/>:</td> <td><h:outputText value="#{msg.destination}"/>:</td>
<td> <td>
<r:spaceSelector label="#{msg.select_destination_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}"
value="#{NewRuleWizard.actionProperties.destinationLocation}" value="#{NewRuleWizard.actionProperties.destinationLocation}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector"/> styleClass="selector"/>

2
source/web/jsp/wizard/new-rule/condition-in-category.jsp
View File

@@ -106,7 +106,7 @@
<tr> <tr>
<td valign="top"><h:outputText value="#{msg.category}"/>:</td> <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
<td width="90%"> <td width="90%">
<r:categorySelector label="#{msg.select_category_prompt}" <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}"
value="#{NewRuleWizard.conditionProperties.category}" value="#{NewRuleWizard.conditionProperties.category}"
styleClass="selector"/> styleClass="selector"/>
</td> </td>

2
source/web/jsp/wizard/new-space/from-existing.jsp
View File

@@ -125,7 +125,7 @@
<tr><td class="paddingRow"></td></tr> <tr><td class="paddingRow"></td></tr>
<tr> <tr>
<td> <td>
<r:spaceSelector label="#{msg.select_existing_space_prompt}" <r:spaceSelector id="space-selector" label="#{msg.select_existing_space_prompt}"
value="#{NewSpaceWizard.existingSpaceId}" value="#{NewSpaceWizard.existingSpaceId}"
initialSelection="#{NavigationBean.currentNodeId}" initialSelection="#{NavigationBean.currentNodeId}"
styleClass="selector" /> styleClass="selector" />

2
source/web/jsp/wizard/new-user/user-properties.jsp
View File

@@ -196,7 +196,7 @@
<tr> <tr>
<td><h:outputText value="#{msg.home_space_location}"/>:</td> <td><h:outputText value="#{msg.home_space_location}"/>:</td>
<td> <td>
<r:spaceSelector label="#{msg.select_home_space_prompt}" value="#{NewUserWizard.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/> <r:spaceSelector id="space-selector" label="#{msg.select_home_space_prompt}" value="#{NewUserWizard.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/>
</td> </td>
</tr> </tr>
<tr> <tr>