summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-04-27 06:12:59 (EDT)
committerManik Kishore2012-06-19 07:28:04 (EDT)
commit1e7db4d76530d851b90cd47fabf4daf43f9f756c (patch)
tree16c2a8639073b0af7de4b6808348ca45aec66ad6
parentde96fd911fed7c730cf57f9453d538f94c271da7 (diff)
downloadorg.eclipse.stardust.ui.web-1e7db4d76530d851b90cd47fabf4daf43f9f756c.zip
org.eclipse.stardust.ui.web-1e7db4d76530d851b90cd47fabf4daf43f9f756c.tar.gz
org.eclipse.stardust.ui.web-1e7db4d76530d851b90cd47fabf4daf43f9f756c.tar.bz2
Jira-ID: CRNT-24576
1)Made changes to documentSearchView.xhtml UI adjustment 2)Updated I18N messages for views.documentSearchView.createDateTo.label and views.documentSearchView.modificationDateTo.label git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55861 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml179
-rw-r--r--views-common/src/main/resources/views-common-messages.properties4
-rw-r--r--views-common/src/main/resources/views-common-messages_de.properties4
-rw-r--r--views-common/src/main/resources/views-common-messages_zh_CN.properties4
4 files changed, 103 insertions, 88 deletions
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml
index 572afa1..ef226ab 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml
@@ -31,7 +31,7 @@
</f:facet>
<table style="vertical-align: top;">
<tr>
- <td style="vertical-align: top;"><ice:panelGrid columns="4"
+ <td style="vertical-align: top;"><ice:panelGrid columns="2"
columnClasses="table-columnVertical"
style="vertical-align: top; white-space: nowrap; text-align:left;"
headerClass="heading">
@@ -53,7 +53,7 @@
</ice:column>
<ice:column>
- <ice:outputText style="margin-left: 20px"
+ <ice:outputText
value="#{documentSearchBean.messages['createDateTo.label']}#{documentSearchBean.messages['colon']}"
styleClass="label-form" />
</ice:column>
@@ -86,7 +86,7 @@
</ice:column>
<ice:column>
- <ice:outputText style="margin-left: 20px"
+ <ice:outputText
value="#{documentSearchBean.messages['modificationDateTo.label']}#{documentSearchBean.messages['colon']}"
styleClass="label-form" />
</ice:column>
@@ -111,14 +111,17 @@
styleClass="label-form" />
</ice:column>
<ice:column>
- <ice:selectManyMenu id="txtDocumentType"
- style="height:75px; width:210px;"
- value="#{documentSearchBean.filterAttributes.selectedDocumentTypes}"
- partialSubmit="true">
- <pc:automationTag value="auto-COM-SrchDoc-DocTypeSel" standAlone="false"/>
- <f:selectItems id="txtDocumentTypes"
- value="#{documentSearchBean.filterAttributes.documentTypes}" />
- </ice:selectManyMenu>
+ <ice:panelGroup style="margin-left:38px;">
+ <ice:selectManyMenu id="txtDocumentType"
+ style="height:75px; width:210px;align:center;"
+ value="#{documentSearchBean.filterAttributes.selectedDocumentTypes}"
+ partialSubmit="true">
+ <pc:automationTag value="auto-COM-SrchDoc-DocTypeSel"
+ standAlone="false" />
+ <f:selectItems id="txtDocumentTypes"
+ value="#{documentSearchBean.filterAttributes.documentTypes}" />
+ </ice:selectManyMenu>
+ </ice:panelGroup>
<ice:message for="txtDocumentType" />
</ice:column>
@@ -129,6 +132,7 @@
</ice:column>
<ice:column>
+ <ice:panelGroup style="margin-left:36px;">
<ice:panelGrid columns="2"
rendered="#{!documentSearchBean.filterAttributes.selectFileTypeAdvance}">
<ice:column>
@@ -140,7 +144,7 @@
standAlone="false" />
</ice:selectBooleanCheckbox>
<ice:outputLabel for="SlctShowAll"
- value="#{documentSearchBean.messages['showAll.label']}" />
+ value="#{documentSearchBean.messages['showAll.label']}" styleClass="label-form" />
</ice:column>
<ice:column>
<ice:commandLink style="margin-left:70px"
@@ -169,32 +173,34 @@
</ice:commandLink>
</ice:column>
</ice:panelGrid>
+ </ice:panelGroup>
</ice:column>
<ice:column>
</ice:column>
<ice:column>
- <ice:selectManyMenu
- rendered="#{!documentSearchBean.filterAttributes.selectFileTypeAdvance}"
- id="txtFileType" style="height:75px; width:210px;"
- value="#{documentSearchBean.filterAttributes.selectedFileTypes}"
- partialSubmit="true">
- <pc:automationTag value="auto-COM-SrchDoc-FileType-TypeSel"
- standAlone="false" />
- <f:selectItems id="txtFileTypes"
- value="#{documentSearchBean.filterAttributes.fileTypes}">
- </f:selectItems>
- </ice:selectManyMenu>
- <ice:message for="txtFileType" />
+ <ice:panelGroup style="margin-left:37px;">
+ <ice:selectManyMenu
+ rendered="#{!documentSearchBean.filterAttributes.selectFileTypeAdvance}"
+ id="txtFileType" style="height:75px; width:210px;"
+ value="#{documentSearchBean.filterAttributes.selectedFileTypes}"
+ partialSubmit="true">
+ <pc:automationTag value="auto-COM-SrchDoc-FileType-TypeSel"
+ standAlone="false" />
+ <f:selectItems id="txtFileTypes"
+ value="#{documentSearchBean.filterAttributes.fileTypes}">
+ </f:selectItems>
+ </ice:selectManyMenu>
+ <ice:message for="txtFileType" />
- <ice:inputText style="width:210px"
- rendered="#{documentSearchBean.filterAttributes.selectFileTypeAdvance}"
- id="advancedFileType" size="26" partialSubmit="true"
- value="#{documentSearchBean.filterAttributes.advancedFileType}">
- <pc:automationTag
- value="auto-COM-SrchDoc-FileType-AdvFileType"
- standAlone="false" />
- </ice:inputText>
+ <ice:inputText style="width:210px"
+ rendered="#{documentSearchBean.filterAttributes.selectFileTypeAdvance}"
+ id="advancedFileType" size="26" partialSubmit="true"
+ value="#{documentSearchBean.filterAttributes.advancedFileType}">
+ <pc:automationTag value="auto-COM-SrchDoc-FileType-AdvFileType"
+ standAlone="false" />
+ </ice:inputText>
+ </ice:panelGroup>
</ice:column>
@@ -205,43 +211,46 @@
styleClass="label-form" />
</ice:column>
<ice:column>
- <ice:selectBooleanCheckbox id="SlctContent"
- value="#{documentSearchBean.filterAttributes.searchContent}"
- partialSubmit="true">
- <pc:automationTag
- value="auto-COM-SrchDoc-ContTxt-SrchContent"
- standAlone="false" />
- </ice:selectBooleanCheckbox>
- <ice:outputLabel for="SlctContent"
- value="#{documentSearchBean.messages['searchContent.label']}" />
- <ice:selectBooleanCheckbox style="margin-left:35px" id="SlctData"
- value="#{documentSearchBean.filterAttributes.searchData}"
- partialSubmit="true">
- <pc:automationTag value="auto-COM-SrchDoc-ContTxt-SrchDate"
- standAlone="false" />
- </ice:selectBooleanCheckbox>
- <ice:outputLabel for="SlctData"
- value="#{documentSearchBean.messages['searchData.label']}" />
- <ice:commandLink style="margin-left:35px"
- action="#{documentSearchBean.filterAttributes.advancedTextSearch}">
- <pc:automationTag
- value="auto-COM-SrchDoc-ContTxt-AdvTxtSrch"
- standAlone="false" />
- <ice:outputText
- value="#{documentSearchBean.messages['advanced.label']} &amp;raquo;"
- styleClass="action-link" escape="false" />
- </ice:commandLink>
+ <ice:panelGroup style="margin-left:36px;">
+ <ice:selectBooleanCheckbox id="SlctContent"
+ value="#{documentSearchBean.filterAttributes.searchContent}"
+ partialSubmit="true">
+ <pc:automationTag value="auto-COM-SrchDoc-ContTxt-SrchContent"
+ standAlone="false" />
+ </ice:selectBooleanCheckbox>
+ <ice:outputLabel for="SlctContent"
+ value="#{documentSearchBean.messages['searchContent.label']}" styleClass="label-form" />
+ <ice:selectBooleanCheckbox style="margin-left:35px"
+ id="SlctData"
+ value="#{documentSearchBean.filterAttributes.searchData}"
+ partialSubmit="true">
+ <pc:automationTag value="auto-COM-SrchDoc-ContTxt-SrchDate"
+ standAlone="false" />
+ </ice:selectBooleanCheckbox>
+ <ice:outputLabel for="SlctData"
+ value="#{documentSearchBean.messages['searchData.label']}" styleClass="label-form" />
+ <ice:commandLink style="margin-left:35px"
+ action="#{documentSearchBean.filterAttributes.advancedTextSearch}">
+ <pc:automationTag value="auto-COM-SrchDoc-ContTxt-AdvTxtSrch"
+ standAlone="false" />
+ <ice:outputText
+ value="#{documentSearchBean.messages['advanced.label']} &amp;raquo;"
+ styleClass="action-link" escape="false" />
+ </ice:commandLink>
+ </ice:panelGroup>
</ice:column>
<ice:column>
</ice:column>
<ice:column>
- <ice:inputTextarea id="txtContainingText" style="width: 320px"
- value="#{documentSearchBean.filterAttributes.containingText}"
- rows="2" />
- <ice:message id="txtContainingTextMsg" for="txtContainingText"
- style="color:red;" />
+ <ice:panelGroup style="margin-left:36px;">
+ <ice:inputTextarea id="txtContainingText" style="width: 260px"
+ value="#{documentSearchBean.filterAttributes.containingText}"
+ rows="2" />
+ <ice:message id="txtContainingTextMsg" for="txtContainingText"
+ style="color:red;" />
+ </ice:panelGroup>
</ice:column>
<!-- <ice:column>
@@ -260,12 +269,14 @@
</ice:column> -->
<ice:column>
- <ice:outputText
- value="#{documentSearchBean.messages['author.label']}#{documentSearchBean.messages['colon']}"
- styleClass="label-form" />
+ <ice:panelGroup style="margin-top:7px;">
+ <ice:outputText
+ value="#{documentSearchBean.messages['author.label']}#{documentSearchBean.messages['colon']}"
+ styleClass="label-form" />
+ </ice:panelGroup>
</ice:column>
<ice:column>
- <ice:panelGroup style="width:153px">
+ <ice:panelGroup style="width:159px;margin-left:36px;">
<ui:include
src="#{documentSearchBean.autoCompleteSelector.autocompleteContentUrl}">
<ui:param name="component"
@@ -280,14 +291,16 @@
styleClass="label-form" />
</ice:column>
<ice:column>
- <ice:inputText id="txtDocumentName" size="26"
- partialSubmit="true"
- value="#{documentSearchBean.filterAttributes.documentName}">
- <pc:automationTag value="auto-COM-SrchDoc-DocName"
- standAlone="false" />
- </ice:inputText>
- <ice:message id="txtDocumentNameMsg" for="txtDocumentName"
- style="color:red;" />
+ <ice:panelGroup style="margin-left:36px;">
+ <ice:inputText id="txtDocumentName" size="26"
+ partialSubmit="true"
+ value="#{documentSearchBean.filterAttributes.documentName}">
+ <pc:automationTag value="auto-COM-SrchDoc-DocName"
+ standAlone="false" />
+ </ice:inputText>
+ <ice:message id="txtDocumentNameMsg" for="txtDocumentName"
+ style="color:red;" />
+ </ice:panelGroup>
</ice:column>
<ice:column>
@@ -296,13 +309,15 @@
styleClass="label-form" />
</ice:column>
<ice:column>
- <ice:inputText id="txtDocumentId" size="26" partialSubmit="true"
- value="#{documentSearchBean.filterAttributes.documentId}">
- <pc:automationTag value="auto-COM-SrchDoc-DocId"
- standAlone="false" />
- </ice:inputText>
- <ice:message id="txtDocumentIdMsg" for="txtDocumentId"
- style="color:red;" />
+ <ice:panelGroup style="margin-left:36px;">
+ <ice:inputText id="txtDocumentId" size="26" partialSubmit="true"
+ value="#{documentSearchBean.filterAttributes.documentId}">
+ <pc:automationTag value="auto-COM-SrchDoc-DocId"
+ standAlone="false" />
+ </ice:inputText>
+ <ice:message id="txtDocumentIdMsg" for="txtDocumentId"
+ style="color:red;" />
+ </ice:panelGroup>
</ice:column>
</ice:panelGrid>
diff --git a/views-common/src/main/resources/views-common-messages.properties b/views-common/src/main/resources/views-common-messages.properties
index 0dd23fd..fb1d6de 100644
--- a/views-common/src/main/resources/views-common-messages.properties
+++ b/views-common/src/main/resources/views-common-messages.properties
@@ -68,9 +68,9 @@ views.correspondenceView.printerDialog.print=Print
views.documentSearchView.label=Document Search
views.documentSearchView.documentSearchCriteria.label=Document Search Criteria
views.documentSearchView.createDate.label=Create Date (From)
-views.documentSearchView.createDateTo.label=To
+views.documentSearchView.createDateTo.label=Create Date (To)
views.documentSearchView.modificationDate.label=Modification Date (From)
-views.documentSearchView.modificationDateTo.label=To
+views.documentSearchView.modificationDateTo.label=Modification Date (To)
views.documentSearchView.author.label=Author
views.documentSearchView.fileType.label=File Type
views.documentSearchView.documentType.label=Document Type
diff --git a/views-common/src/main/resources/views-common-messages_de.properties b/views-common/src/main/resources/views-common-messages_de.properties
index a10ab87..b21c4d1 100644
--- a/views-common/src/main/resources/views-common-messages_de.properties
+++ b/views-common/src/main/resources/views-common-messages_de.properties
@@ -68,9 +68,9 @@ views.correspondenceView.printerDialog.print = Drucken
views.documentSearchView.label = Dokumentensuche
views.documentSearchView.documentSearchCriteria.label = Dokument Suchkriterien
views.documentSearchView.createDate.label = Erstellen Datum (From)
-views.documentSearchView.createDateTo.label = Bis
+views.documentSearchView.createDateTo.label = +Create Date (To)
views.documentSearchView.modificationDate.label = \u00C4nderungsdatum (Von)
-views.documentSearchView.modificationDateTo.label = Bis
+views.documentSearchView.modificationDateTo.label = +Modification Date (To)
views.documentSearchView.author.label = Autor
views.documentSearchView.fileType.label = Dateityp
views.documentSearchView.documentType.label = Dokumenttyp
diff --git a/views-common/src/main/resources/views-common-messages_zh_CN.properties b/views-common/src/main/resources/views-common-messages_zh_CN.properties
index 03897a2..2a88a9c 100644
--- a/views-common/src/main/resources/views-common-messages_zh_CN.properties
+++ b/views-common/src/main/resources/views-common-messages_zh_CN.properties
@@ -68,9 +68,9 @@ views.correspondenceView.printerDialog.print = \u6253\u5370
views.documentSearchView.label = \u6587\u6863\u641C\u7D22
views.documentSearchView.documentSearchCriteria.label = \u6587\u6863\u641C\u7D22\u6807\u51C6
views.documentSearchView.createDate.label = \u521B\u5EFA\u65E5\u671F (\u4ECE)
-views.documentSearchView.createDateTo.label = \u81F3
+views.documentSearchView.createDateTo.label = +Create Date (To)
views.documentSearchView.modificationDate.label = \u4FEE\u6539\u65E5\u671F (\u4ECE)
-views.documentSearchView.modificationDateTo.label = \u81F3
+views.documentSearchView.modificationDateTo.label = +Modification Date (To)
views.documentSearchView.author.label = \u4F5C\u8005
views.documentSearchView.fileType.label = \u6587\u4EF6\u7C7B\u578B
views.documentSearchView.documentType.label = \u6587\u6863\u7C7B\u578B