ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Adrian Crum <adri...@hlmksw.com>
Subject Re: svn commit: r617499 [1/3] - in /ofbiz/trunk/applications/content: config/ webapp/content/lookup/ webapp/content/survey/ webapp/content/website/ widget/ widget/content/ widget/forum/
Date Fri, 01 Feb 2008 17:35:21 GMT
Marco,

I didn't notice until now that your UI work uses the head4 style in the screenlet title bar. You 
should be using the head3 style. In fact, the head4 style you committed a while back is just a 
duplication of the head3 style.

I'll commit some changes to maincss.css that will help with your efforts. At some point in time it 
would be nice to replace all the head4 references with head3.

I'm sorry I didn't bring this up sooner. I didn't notice it until I started merging my Forum UI work 
with your recent changes.

-Adrian

mrisaliti@apache.org wrote:
> Author: mrisaliti
> Date: Fri Feb  1 05:48:17 2008
> New Revision: 617499
> 
> URL: http://svn.apache.org/viewvc?rev=617499&view=rev
> Log:
> WebSite/Survey/Forum/Content/Lookup forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1601)
> 
> Modified:
>     ofbiz/trunk/applications/content/config/ContentUiLabels.properties
>     ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties
>     ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
>     ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
>     ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
>     ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
>     ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
>     ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
>     ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
>     ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl
>     ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
>     ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl
>     ofbiz/trunk/applications/content/widget/LookupScreens.xml
>     ofbiz/trunk/applications/content/widget/SurveyScreens.xml
>     ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
>     ofbiz/trunk/applications/content/widget/content/ContentForms.xml
>     ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
>     ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
>     ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml
>     ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
> 
> Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.properties
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.properties?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/config/ContentUiLabels.properties (original)
> +++ ofbiz/trunk/applications/content/config/ContentUiLabels.properties Fri Feb  1 05:48:17 2008
> @@ -26,6 +26,13 @@
>  ContentAssociation=Association
>  ContentAttribute=Attribute
>  ContentEditProductStore=Edit Product Store
> +ContentWebSiteAddMenu=Add Menu
> +ContentWebSiteAddNewMenus=*Right click to add new menus
> +ContentWebSiteAddSubdContent=*Right click to add sub-content
> +ContentWebSiteAddTree=Add Tree
> +ContentWebSiteAttachedToContent=attached to Content
> +ContentWebSiteContent=Web Site Content
> +ContentWebSiteMenus=Web Site Menus
>  ContentWebSite=WebSite
>  ContentWebSites=WebSites
>  ContentCategory=Category
> @@ -38,6 +45,7 @@
>  ContentDataResourceProductFeatures=Product Features
>  ContentDataResourceRole=Role
>  ContentDataResourceText=Text
> +ContentDataType=Data Type
>  ContentFileExt=File Ext
>  ContentGoToDataResource=Go to Data Resource
>  ContentMetadata=Metadata
> @@ -87,12 +95,24 @@
>  ContentParent=Parent Content
>  ContentMapKey=MapKey
>  ContentCloneLayout=Clone Layout
> +ContentResourceNone=None (Tree, Category, etc)
> +ContentResourceShortText=Short Text (255 chars.)
> +ContentResourceLongText=Long Text
> +ContentResourceUrlResource=URL Resource
> +ContentResourceImage=Image
> +ContentResourceVideo=Video
> +ContentResourceAudio=Audio
> +ContentResourceOther=Other
>  
>  ForumGroupCreate=Create new forumgroup
>  ForumAddTo=Add forum to
>  ForumAddRoleTo=Add role to
>  ForumAddPurposeTo=Add purpose to
> +ForumAddResponseToMessage=Add a response to message
>  ForumAddThreadTo=Add new thread to this Forum
> +ForumMessage=Message
> +ForumMessages=Msgs
> +ForumThread=thread
>  
>  PageTitleAddAssociation=Add an association
>  PageTitleAddAttribute=Add an attribute
> @@ -140,6 +160,8 @@
>  PageTitleEditElectronicText=Edit Electronic Text
>  PageTitleEditHtmlText=Edit Html Text
>  PageTitleEditRootCompDoc=Edit Root Composite Document
> +PageTitleCreateWebSiteContent=Create Web Site Content
> +PageTitleCreateWebSiteParties=Create Web Site Parties
>  PageTitleCreateSurvey=Create Survey
>  PageTitleEditSurvey=Edit Survey
>  PageTitleEditSurveyQuestions=Edit Survey Questions
> @@ -159,6 +181,8 @@
>  PageTitleListWebSite=WebSite List
>  PageTitleLookupContent=Lookup Content
>  PageTitleLookupDataResource=Lookup Data Resource
> +PageTitleLookupListLayout=Lookup List Layout
> +PageTitleLookupSubContent=Lookup Sub Content
>  PageTitleLookupSurvey=Lookup Survey
>  PageTitleLookupSurveyResponse=Lookup Survey Response
>  PageTitleFindForumGroup= Forumgroup list
> @@ -171,11 +195,15 @@
>  PageTitleEditForumMessage=Edit message:
>  PageTitleEditSurveyMultiResps=Edit Survey Multi-Response Groups
>  PageTitleEditSurveyPages=Edit Survey Pages
> +PageTitleListSurveyPages=List Survey Pages
>  PageTitleFindSurveyResponse=Find Survey Response
> +PageTitleListSurveyResponse=List Survey Response
>  PageTitleViewSurveyResponses=View Survey Responses
>  PageTitleEditSurveyResponse=Edit Survey Response
>  PageTitleUploadImageDataResource=Upload Image
>  PageTitleWebSiteContent=WebSite Content
> +PageTitleWebSiteCMSNav=Web Site CMS Nav
> +PageTitleWebSiteCMSContent=Web Site CMS Content
>  PageTitleAutoCreateContentPublishPoints=Auto-Create Content Publish Points
>  PageTitleEditLayout=Edit Layout
>  PageTitleFindLayout=Find Layout
> @@ -368,4 +396,12 @@
>  FormFieldTitle_webSiteContentTypeId=Web Site Content Type Id
>  FormFieldTitle_mainAction=Main Action
>  FormFieldTitle_resourceDescription=Resource Description
> -FormFieldTitle_dataResourceId=Data Resource Id
> \ No newline at end of file
> +FormFieldTitle_dataResourceId=Data Resource Id
> +FormFieldTitle_coContentId=Content Id
> +FormFieldTitle_coContentName=Content Name
> +FormFieldTitle_coDescription=Content Description
> +FormFieldTitle_replace=Replace
> +FormFieldTitle_pasteContent=Paste Content
> +FormFieldTitle_dataResourceName=Data Resource Name
> +FormFieldTitle_dataCategoryId=Data Category Id
> +FormFieldTitle_drObjectInfo=Template File
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties (original)
> +++ ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties Fri Feb  1 05:48:17 2008
> @@ -26,6 +26,13 @@
>  ContentAssociation=Associazione
>  ContentAttribute=Attributi
>  ContentEditProductStore=Aggiorna Negozio
> +ContentWebSiteAddMenu=Aggiungi Menu
> +ContentWebSiteAddNewMenus=*Click destro per aggiungere un nuovo menu
> +ContentWebSiteAddSubdContent=*Click destro per aggiungere il sotto-contenuto
> +ContentWebSiteAddTree=Aggiungi Albero
> +ContentWebSiteAttachedToContent=allegato al Contenuto
> +ContentWebSiteContent=Contenuto Sito Web
> +ContentWebSiteMenus=Menu Sito Web
>  ContentWebSite=Sito Web
>  ContentWebSites=Siti Web
>  ContentCategory=Categoria
> @@ -38,6 +45,7 @@
>  ContentDataResourceProductFeatures=Caratteristiche Prodotto
>  ContentDataResourceRole=Ruolo
>  ContentDataResourceText=Testo
> +ContentDataType=Tipo Dati
>  ContentFileExt=Estensione File
>  ContentGoToDataResource=Vai alla Risorsa Dati
>  ContentMetadata=Metadati
> @@ -85,12 +93,24 @@
>  ContentParent=Contenuto Padre
>  ContentMapKey=Chiave Mappa
>  ContentCloneLayout=Clona Layout
> +ContentResourceNone=Nessuno (Albero, Categoria, etc)
> +ContentResourceShortText=Testo Breve (255 carat.)
> +ContentResourceLongText=Testo Lungo
> +ContentResourceUrlResource=Risorsa URL
> +ContentResourceImage=Immagine
> +ContentResourceVideo=Video
> +ContentResourceAudio=Audio
> +ContentResourceOther=Altro
>  
>  ForumGroupCreate=Creare nuovo gruppo forum
>  ForumAddTo=Aggiungi al forum
>  ForumAddRoleTo=Aggiungi ruolo a
>  ForumAddPurposeTo=Aggiungi funzione a
> +ForumAddResponseToMessage=Aggiungi una risposta al messaggio
>  ForumAddThreadTo=Aggiungi nuovo thread a questo Forum
> +ForumMessage=Messaggio
> +ForumMessages=Messaggi
> +ForumThread=thread
>  
>  PageTitleAddAssociation=Aggiungi una associazione
>  PageTitleAddAttribute=Aggiungi un'attributo
> @@ -102,6 +122,8 @@
>  PageTitleAddMetaData=Aggiungi Metadati
>  PageTitleAddPurpose=Aggiungi una Funzione
>  PageTitleAddRole=Aggiungi un Ruolo
> +PageTitleCreateWebSiteContent=Creare Contenuto Sito Web
> +PageTitleCreateWebSiteParties=Creare Soggetti Sito Web
>  PageTitleEditAssociation=Aggiorna una associazione
>  PageTitleEditCMSContent=Aggiorna Contenuto CMS
>  PageTitleEditContent=Aggiorna Contenuto
> @@ -156,6 +178,8 @@
>  PageTitleListWebSite=Lista Siti Web
>  PageTitleLookupContent=Ricerca Contenuto
>  PageTitleLookupDataResource=Ricerca Risorse Dati
> +PageTitleLookupListLayout=Ricerca Layout
> +PageTitleLookupSubContent=Ricerca Sotto-Contenuto
>  PageTitleLookupSurvey=Ricerca Sondaggio
>  PageTitleLookupSurveyResponse=Ricerca Risposta Sondaggio
>  PageTitleFindForumGroup=Lista gruppo Forum
> @@ -168,11 +192,15 @@
>  PageTitleEditForumMessage=Aggiorna messaggio:
>  PageTitleEditSurveyMultiResps=Aggiorna Risposte Multiple Gruppo Sondaggio
>  PageTitleEditSurveyPages=Aggiorna Pagine Sondaggio
> +PageTitleListSurveyPages=Lista Pagine Sondaggio
>  PageTitleFindSurveyResponse=Ricerca Risposte Sondaggio
> +PageTitleListSurveyResponse=Lista Risposte Sondaggio
>  PageTitleViewSurveyResponses=Mostra Risposte Sondaggio
>  PageTitleEditSurveyResponse=Aggiorna Risposta Sondaggio
>  PageTitleUploadImageDataResource=Carica Immagine
>  PageTitleWebSiteContent=Contenuto Sito Web
> +PageTitleWebSiteCMSNav=Sito Web Site CMS Navigazione
> +PageTitleWebSiteCMSContent=Sito Web CMS Contenuto
>  PageTitleAutoCreateContentPublishPoints=Creazioni-Automatica Contenuto Punti Pubblicati
>  PageTitleEditLayout=Aggiorna Layout
>  PageTitleFindLayout=Ricerca Layout
> @@ -225,6 +253,7 @@
>  FormFieldTitle_cookieDomain=Dominio Cookie
>  FormFieldTitle_partyId=Codice Soggetto
>  FormFieldTitle_roleTypeId=Tipo Ruolo
> +FormFieldTitle_caFromDate=Dalla Data e Ora
>  FormFieldTitle_fromDate=Dalla Data e Ora
>  FormFieldTitle_thruDate=Alla Data e Ora
>  FormFieldTitle_surveyId=Numero Sondaggio
> @@ -364,4 +393,12 @@
>  FormFieldTitle_webSiteContentTypeId=Tipo Contenuto Sito Web
>  FormFieldTitle_mainAction=Azione Principale
>  FormFieldTitle_resourceDescription=Descrizione Risorsa
> -FormFieldTitle_dataResourceId=Risorsa Dati
> \ No newline at end of file
> +FormFieldTitle_dataResourceId=Risorsa Dati
> +FormFieldTitle_coContentId=Contenuto
> +FormFieldTitle_coContentName=Nome Conteunto
> +FormFieldTitle_coDescription=Descrizione Contenuto
> +FormFieldTitle_replace=Sostituisci
> +FormFieldTitle_pasteContent=Incolla Contenuto
> +FormFieldTitle_dataResourceName=Nome Risorsa Dati
> +FormFieldTitle_dataCategoryId=Categoria Dati
> +FormFieldTitle_drObjectInfo=File Template
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original)
> +++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Fri Feb  1 05:48:17 2008
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="UTF-8" ?>
> +<?xml version="1.0" encoding="UTF-8"?>
>  <!--
>  Licensed to the Apache Software Foundation (ASF) under one
>  or more contributor license agreements.  See the NOTICE file
> @@ -21,7 +21,8 @@
>  <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
>          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
>  
> -    <form name="lookupListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="entityList" target="" title="" type="list" paginate-target="LookupListLayout">
> +    <form name="lookupListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="entityList" target="" title="" type="list" 
> +        paginate-target="LookupListLayout" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <entity-condition entity-name="ContentAssocDataResourceViewFrom" list-name="entityList" >
>                  <condition-expr field-name="caContentIdTo" value="TEMPLATE_MASTER"/>
> @@ -32,17 +33,18 @@
>          </field>
>          <field name="contentName"><display/></field>
>          <field name="description"><display/></field>
> -        <field name="drObjectInfo" title="Template File"><display/></field>
> +        <field name="drObjectInfo"><display/></field>
>      </form>
>  
> -    <form name="lookupDataResourceContent" default-entity-name="DataResourceContentView" target="LookupSubContent" title="" type="single">
> -        <field name="dataResourceId" title="DataResource Id">
> +    <form name="lookupDataResourceContent" default-entity-name="DataResourceContentView" target="LookupSubContent" title="" type="single"
> +        header-row-style="header-row" default-table-style="basic-table">
> +        <field name="dataResourceId">
>              <text-find/>
>          </field>
> -        <field name="coContentId" title="Content Id">
> +        <field name="coContentId">
>              <text-find/>
>          </field>
> -        <field name="coContentName" title="Name">
> +        <field name="coContentName">
>              <text-find/>
>          </field>
>          <field name="coDescription">
> @@ -60,7 +62,7 @@
>          <field name="lastModifiedDate">
>              <date-find/>
>          </field>
> -        <field name="submitButton" title="Find" widget-style="smallSubmit">
> +        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
>              <submit button-type="button"/>
>          </field>
>          <field name="contentIdTo">
> @@ -71,28 +73,28 @@
>          </field>
>      </form>
>  
> -    <form name="listLookupDataResourceContent" default-entity-name="DataResourceContentView" list-name="listIt" target="" title="" type="list" paginate-target="LookupSubContent">
> +    <form name="listLookupDataResourceContent" default-entity-name="DataResourceContentView" list-name="listIt" target="" title="" type="list" 
> +        paginate-target="LookupSubContent" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
>                  <field-map field-name="inputFields" env-name="parameters"/>
>                  <field-map field-name="entityName" value="DataResourceContentView"/>
>              </service>
>          </actions>
> -        <field name="replace" title="Replace" widget-style="buttontext" >
> +        <field name="replace" widget-style="buttontext" >
>              <hyperlink also-hidden="false" target-type="plain" description="Replace[${dataResourceId}/${coContentId}]" 
>                 target="javascript:execRemoteCall('replaceSubContent','${dataResourceId}','${coContentId}', '${contentIdTo}', '${mapKey}')"
>              />
>          </field>
> -        <field name="pasteContent" title="Paste" widget-style="buttontext" >
> +        <field name="pasteContent" widget-style="buttontext" >
>              <hyperlink also-hidden="false" target-type="plain" description="Paste[${dataResourceId}/${coContentId}]" 
>                 target="javascript:execRemoteCall('pasteContent','${dataResourceId}','${coContentId}')"/>
>          </field>
> -        <field name="dataResourceName" title="Name" widget-style="buttontext">
> +        <field name="dataResourceName" widget-style="buttontext">
>              <display/>
>          </field>
> -        <field name="dataCategoryId" title="Category" widget-style="buttontext">
> +        <field name="dataCategoryId" widget-style="buttontext">
>              <display/>
>          </field>
>      </form>
> -
> -</forms>
> +</forms>
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original)
> +++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Fri Feb  1 05:48:17 2008
> @@ -16,236 +16,294 @@
>  specific language governing permissions and limitations
>  under the License.
>  -->
> -
> -  <table border="1" cellpadding='2' cellspacing='0'>
> -    <tr>
> -      <td><div class="tableheadtext">${uiLabelMap.CommonId}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.CommonType}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.SurveryCategory}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.SurveyQuestion}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.CommonPage}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.SurveyMultiResp}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.SurveyMultiRespColumn}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.CommonRequired}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.SurveyWithQuestion}</div></td>
> -      <td><div class="tableheadtext">${uiLabelMap.SurveyWithOption}</div></td>
> -      <td><div class="tableheadtext">&nbsp;</div></td>
> -      <td><div class="tableheadtext">&nbsp;</div></td>
> -      <td><div class="tableheadtext">&nbsp;</div></td>
> -    </tr>
> -
> -    <#list surveyQuestionAndApplList as surveyQuestionAndAppl>
> -      <#assign questionType = surveyQuestionAndAppl.getRelatedOneCache("SurveyQuestionType")/>
> -      <#assign questionCat = surveyQuestionAndAppl.getRelatedOneCache("SurveyQuestionCategory")?if_exists/>
> -      <#assign currentSurveyPage = surveyQuestionAndAppl.getRelatedOneCache("SurveyPage")?if_exists/>
> -      <#assign currentSurveyMultiResp = surveyQuestionAndAppl.getRelatedOneCache("SurveyMultiResp")?if_exists/>
> -      <#if currentSurveyMultiResp?has_content>
> -        <#assign currentSurveyMultiRespColumns = currentSurveyMultiResp.getRelated("SurveyMultiRespColumn")/>
> -      <#else/>
> -        <#assign currentSurveyMultiRespColumns = []/>
> -      </#if>
> -      <form method="post" action="<@ofbizUrl>updateSurveyQuestionAppl</@ofbizUrl>">
> -        <input type="hidden" name="surveyId" value="${surveyQuestionAndAppl.surveyId}">
> -        <input type="hidden" name="surveyQuestionId" value="${surveyQuestionAndAppl.surveyQuestionId}">
> -        <input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}">
> -        <tr valign="middle">
> -          <td><div class="tabletext">${surveyQuestionAndAppl.surveyQuestionId}</div></td>
> -          <td><div class="tabletext">${questionType.get("description",locale)}</div></td>
> -          <td><div class="tabletext">${(questionCat.description)?if_exists}</div></td>
> -          <td><div class="tabletext">${surveyQuestionAndAppl.description?if_exists}</div></td>
> -          <td><input type="text" name="question" size="30" class="inputBox" value="${surveyQuestionAndAppl.question?if_exists?html}">
> -          <td>
> -            <select class="selectBox" name="surveyPageId">
> -              <#if surveyQuestionAndAppl.surveyPageSeqId?has_content>
> -                <option value="${surveyQuestionAndAppl.surveyPageSeqId}">${(currentSurveyPage.pageName)?if_exists} [${surveyQuestionAndAppl.surveyPageSeqId}]</option>
> -                <option value="${surveyQuestionAndAppl.surveyPageSeqId}">----</option>
> -              </#if>
> -              <option value=""></option>
> -              <#list surveyPageList as surveyPage>
> -                <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName?if_exists} [${surveyPage.surveyPageSeqId}]</option>
> -              </#list>
> -            </select>
> -          </td>
> -          <td>
> -            <select class="selectBox" name="surveyMultiRespId">
> -              <#if surveyQuestionAndAppl.surveyMultiRespId?has_content>
> -                <option value="${surveyQuestionAndAppl.surveyMultiRespId}">${(currentSurveyMultiResp.multiRespTitle)?if_exists} [${surveyQuestionAndAppl.surveyMultiRespId}]</option>
> -                <option value="${surveyQuestionAndAppl.surveyMultiRespId}">----</option>
> -              </#if>
> -              <option value=""></option>
> -              <#list surveyMultiRespList as surveyMultiResp>
> -                <option value="${surveyMultiResp.surveyMultiRespId}">${surveyMultiResp.multiRespTitle} [${surveyMultiResp.surveyMultiRespId}]</option>
> -              </#list>
> -            </select>
> -          </td>
> -          <#if currentSurveyMultiRespColumns?has_content>
> -          <td>
> -            <select class="selectBox" name="surveyMultiRespColId">
> -              <#if surveyQuestionAndAppl.surveyMultiRespColId?has_content>
> -                <#assign currentSurveyMultiRespColumn = surveyQuestionAndAppl.getRelatedOne("SurveyMultiRespColumn")/>
> -                <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${(currentSurveyMultiRespColumn.columnTitle)?if_exists} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option>
> -                <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">----</option>
> -              </#if>
> -              <option value=""></option>
> -              <#list currentSurveyMultiRespColumns as currentSurveyMultiRespColumn>
> -                <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${currentSurveyMultiRespColumn.columnTitle} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option>
> -              </#list>
> -            </select>
> -          </td>
> +<div class="screenlet">
> +  <div class="screenlet-title-bar">
> +    <ul>
> +      <li class="head3">${uiLabelMap.PageTitleEditSurveyQuestions} ${uiLabelMap.SurveySurveyId} ${surveyId}</li>
> +    </ul>
> +    <br class="clear"/>
> +  </div>  
> +  <div class="screenlet-body">
> +      <table class="basic-table hover-bar" cellspacing="0">
> +        <tr class="header-row">
> +          <td>${uiLabelMap.CommonId}</td>
> +          <td>${uiLabelMap.CommonType}</td>
> +          <td>${uiLabelMap.SurveryCategory}</td>
> +          <td>${uiLabelMap.CommonDescription}</td>
> +          <td>${uiLabelMap.SurveyQuestion}</td>
> +          <td>${uiLabelMap.CommonPage}</td>
> +          <td>${uiLabelMap.SurveyMultiResp}</td>
> +          <td>${uiLabelMap.SurveyMultiRespColumn}</td>
> +          <td>${uiLabelMap.CommonRequired}</td>
> +          <td>${uiLabelMap.CommonSequenceNum}</td>
> +          <td>${uiLabelMap.SurveyWithQuestion}</td>
> +          <td>${uiLabelMap.SurveyWithOption}</td>
> +          <td>&nbsp;</td>
> +          <td>&nbsp;</td>
> +          <td>&nbsp;</td>
> +        </tr>
> +        <#assign alt_row = false>
> +        <#list surveyQuestionAndApplList as surveyQuestionAndAppl>
> +          <#assign questionType = surveyQuestionAndAppl.getRelatedOneCache("SurveyQuestionType")/>
> +          <#assign questionCat = surveyQuestionAndAppl.getRelatedOneCache("SurveyQuestionCategory")?if_exists/>
> +          <#assign currentSurveyPage = surveyQuestionAndAppl.getRelatedOneCache("SurveyPage")?if_exists/>
> +          <#assign currentSurveyMultiResp = surveyQuestionAndAppl.getRelatedOneCache("SurveyMultiResp")?if_exists/>
> +          <#if currentSurveyMultiResp?has_content>
> +            <#assign currentSurveyMultiRespColumns = currentSurveyMultiResp.getRelated("SurveyMultiRespColumn")/>
>            <#else/>
> -            <td><input type="text" name="surveyMultiRespColId" size="4" class="inputBox" value="${surveyQuestionAndAppl.surveyMultiRespColId?if_exists}"/></td>
> +            <#assign currentSurveyMultiRespColumns = []/>
>            </#if>
> -          <td>
> -            <select class="selectBox" name="requiredField">
> -              <option>${surveyQuestionAndAppl.requiredField?default("N")}</option>
> -              <option value="${surveyQuestionAndAppl.requiredField?default("N")}">----</option>
> -              <option>Y</option><option>N</option>
> -            </select>
> -          </td>
> -          <td><input type="text" name="sequenceNum" size="5" class="inputBox" value="${surveyQuestionAndAppl.sequenceNum?if_exists}"/></td>
> -          <td><input type="text" name="withSurveyQuestionId" size="5" class="inputBox" value="${surveyQuestionAndAppl.withSurveyQuestionId?if_exists}"/></td>
> -          <td><input type="text" name="withSurveyOptionSeqId" size="5" class="inputBox" value="${surveyQuestionAndAppl.withSurveyOptionSeqId?if_exists}"/></td>
> -          <td><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td>
> -          <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.SurveyQuestion}</a></td>
> -          <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${surveyQuestionAndAppl.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}&fromDate=${surveyQuestionAndAppl.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a></td>
> -        </tr>
> +          <form method="post" action="<@ofbizUrl>updateSurveyQuestionAppl</@ofbizUrl>">
> +            <input type="hidden" name="surveyId" value="${surveyQuestionAndAppl.surveyId}">
> +            <input type="hidden" name="surveyQuestionId" value="${surveyQuestionAndAppl.surveyQuestionId}">
> +            <input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}">
> +            <tr<#if alt_row> class="alternate-row"</#if>>
> +              <td>${surveyQuestionAndAppl.surveyQuestionId}</td>
> +              <td>${questionType.get("description",locale)}</td>
> +              <td>${(questionCat.description)?if_exists}</td>
> +              <td>${surveyQuestionAndAppl.description?if_exists}</td>
> +              <td><input type="text" name="question" size="30" value="${surveyQuestionAndAppl.question?if_exists?html}">
> +              <td>
> +                <select name="surveyPageId">
> +                  <#if surveyQuestionAndAppl.surveyPageSeqId?has_content>
> +                    <option value="${surveyQuestionAndAppl.surveyPageSeqId}">${(currentSurveyPage.pageName)?if_exists} [${surveyQuestionAndAppl.surveyPageSeqId}]</option>
> +                    <option value="${surveyQuestionAndAppl.surveyPageSeqId}">----</option>
> +                  </#if>
> +                  <option value=""></option>
> +                  <#list surveyPageList as surveyPage>
> +                    <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName?if_exists} [${surveyPage.surveyPageSeqId}]</option>
> +                  </#list>
> +                </select>
> +              </td>
> +              <td>
> +                <select name="surveyMultiRespId">
> +                  <#if surveyQuestionAndAppl.surveyMultiRespId?has_content>
> +                    <option value="${surveyQuestionAndAppl.surveyMultiRespId}">${(currentSurveyMultiResp.multiRespTitle)?if_exists} [${surveyQuestionAndAppl.surveyMultiRespId}]</option>
> +                    <option value="${surveyQuestionAndAppl.surveyMultiRespId}">----</option>
> +                  </#if>
> +                  <option value=""></option>
> +                  <#list surveyMultiRespList as surveyMultiResp>
> +                    <option value="${surveyMultiResp.surveyMultiRespId}">${surveyMultiResp.multiRespTitle} [${surveyMultiResp.surveyMultiRespId}]</option>
> +                  </#list>
> +                </select>
> +              </td>
> +              <#if currentSurveyMultiRespColumns?has_content>
> +              <td>
> +                <select name="surveyMultiRespColId">
> +                  <#if surveyQuestionAndAppl.surveyMultiRespColId?has_content>
> +                    <#assign currentSurveyMultiRespColumn = surveyQuestionAndAppl.getRelatedOne("SurveyMultiRespColumn")/>
> +                    <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${(currentSurveyMultiRespColumn.columnTitle)?if_exists} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option>
> +                    <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">----</option>
> +                  </#if>
> +                  <option value=""></option>
> +                  <#list currentSurveyMultiRespColumns as currentSurveyMultiRespColumn>
> +                    <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${currentSurveyMultiRespColumn.columnTitle} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option>
> +                  </#list>
> +                </select>
> +              </td>
> +              <#else/>
> +                <td><input type="text" name="surveyMultiRespColId" size="4" value="${surveyQuestionAndAppl.surveyMultiRespColId?if_exists}"/></td>
> +              </#if>
> +              <td>
> +                <select name="requiredField">
> +                  <option>${surveyQuestionAndAppl.requiredField?default("N")}</option>
> +                  <option value="${surveyQuestionAndAppl.requiredField?default("N")}">----</option>
> +                  <option>Y</option><option>N</option>
> +                </select>
> +              </td>
> +              <td><input type="text" name="sequenceNum" size="5" value="${surveyQuestionAndAppl.sequenceNum?if_exists}"/></td>
> +              <td><input type="text" name="withSurveyQuestionId" size="5" value="${surveyQuestionAndAppl.withSurveyQuestionId?if_exists}"/></td>
> +              <td><input type="text" name="withSurveyOptionSeqId" size="5" value="${surveyQuestionAndAppl.withSurveyOptionSeqId?if_exists}"/></td>
> +              <td><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td>
> +              <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.SurveyQuestion}</a></td>
> +              <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${surveyQuestionAndAppl.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}&fromDate=${surveyQuestionAndAppl.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a></td>
> +            </tr>
> +          </form>
> +          <#assign alt_row = !alt_row>
> +        </#list>
> +      </table>
> +  </div>
> +</div>
> +<#-- apply question from category -->
> +<#if surveyQuestionCategory?has_content>
> +    <div class="screenlet">
> +      <div class="screenlet-title-bar">
> +        <ul>
> +          <li class="head3">${uiLabelMap.SurveyApplyQuestionFromCategory} - ${surveyQuestionCategory.description?if_exists} [${surveyQuestionCategory.surveyQuestionCategoryId}]</li>
> +        </ul>
> +        <br class="clear"/>
> +      </div>  
> +      <div class="screenlet-body">
> +        <a name="appl">
> +        <table class="basic-table hover-bar" cellspacing="0">
> +            <tr class="header-row">
> +                <td>${uiLabelMap.CommonId}</td>
> +                <td>${uiLabelMap.CommonDescription}</td>
> +                <td>${uiLabelMap.CommonType}</td>
> +                <td>${uiLabelMap.SurveyQuestion}</td>
> +                <td>${uiLabelMap.CommonPage}</td>
> +                <td>${uiLabelMap.SurveyMultiResp}</td>
> +                <td>${uiLabelMap.SurveyMultiRespColumn}</td>
> +                <td>${uiLabelMap.CommonRequired}</td>
> +                <td>${uiLabelMap.CommonSequenceNum}</td>
> +                <td>${uiLabelMap.SurveyWithQuestion}</td>
> +                <td>${uiLabelMap.SurveyWithOption}</td>
> +                <td>&nbsp;</td>
> +              </tr>
> +          <#assign alt_row = false>
> +          <#list categoryQuestions as question>
> +            <#assign questionType = question.getRelatedOne("SurveyQuestionType")>
> +            <form method="post" action="<@ofbizUrl>createSurveyQuestionAppl</@ofbizUrl>">
> +              <input type="hidden" name="surveyId" value="${requestParameters.surveyId}">
> +              <input type="hidden" name="surveyQuestionId" value="${question.surveyQuestionId}">
> +              <input type="hidden" name="surveyQuestionCategoryId" value="${requestParameters.surveyQuestionCategoryId}">
> +              <tr<#if alt_row> class="alternate-row"</#if>>
> +                <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${question.surveyQuestionId}&surveyQuestionCategoryId=${requestParameters.surveyQuestionCategoryId}#edit</@ofbizUrl>" class="buttontext">${question.surveyQuestionId}</a></td>
> +                <td>${question.description?if_exists}</td>
> +                <td>${questionType.get("description",locale)}</td>
> +                <td>${question.question?if_exists}</td>
> +              <td>
> +                <select name="surveyPageId">
> +                  <option value=""></option>
> +                  <#list surveyPageList as surveyPage>
> +                    <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName} [${surveyPage.surveyPageSeqId}]</option>
> +                  </#list>
> +                </select>
> +              </td>
> +              <td>
> +                <select name="surveyMultiRespId">
> +                  <option value=""></option>
> +                  <#list surveyMultiRespList as surveyMultiResp>
> +                    <option value="${surveyMultiResp.surveyMultiRespId}">${surveyMultiResp.multiRespTitle} [${surveyMultiResp.surveyMultiRespId}]</option>
> +                  </#list>
> +                </select>
> +              </td>
> +                <td><input type="text" name="surveyMultiRespColId" size="4"/></td>
> +                <td>
> +                  <select name="requiredField">
> +                    <option>N</option>
> +                    <option>Y</option>
> +                  </select>
> +                </td>
> +                <td><input type="text" name="sequenceNum" size="5"/></td>
> +                <td><input type="text" name="withSurveyQuestionId" size="5"/></td>
> +                <td><input type="text" name="withSurveyOptionSeqId" size="5"/></td>
> +                <td><input type="submit" value="${uiLabelMap.CommonApply}" class="smallSubmit"/></td>
> +              </tr>
> +            </form>
> +            <#assign alt_row = !alt_row>
> +          </#list>
> +        </table>
> +      </div>
> +    </div>
> +</#if>
> +<div class="screenlet">
> +  <div class="screenlet-title-bar">
> +    <ul>
> +      <li class="head3">${uiLabelMap.SurveyApplyQuestionFromCategory}</li>
> +    </ul>
> +    <br class="clear"/>
> +  </div>  
> +  <div class="screenlet-body">
> +      <form method="post" action="<@ofbizUrl>EditSurveyQuestions</@ofbizUrl>">
> +        <input type="hidden" name="surveyId" value="${requestParameters.surveyId}"/>
> +        <select name="surveyQuestionCategoryId">
> +          <#list questionCategories as category>
> +            <option value="${category.surveyQuestionCategoryId}">${category.description?default("??")} [${category.surveyQuestionCategoryId}]</option>
> +          </#list>
> +        </select>
> +        &nbsp;
> +        <input type="submit" value="${uiLabelMap.CommonApply}" class="smallSubmit"/>
>        </form>
> -    </#list>
> -  </table>
> -  <br/>
> -  <#-- apply question from category -->
> -  <#if surveyQuestionCategory?has_content>
> -    <hr class="sepbar">
> -    <a name="appl">
> -    <h1>${uiLabelMap.SurveyApplyQuestionFromCategory} - <span class="head2">${surveyQuestionCategory.description?if_exists} [${surveyQuestionCategory.surveyQuestionCategoryId}]</h1>
> -    <br/><br/>
> -    <table border="1" cellpadding='2' cellspacing='0'>
> -      <tr>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonId}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonType}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.SurveyQuestion}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonPage}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.SurveyMultiResp}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.SurveyMultiRespColumn}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonRequired}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.SurveyWithQuestion}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.SurveyWithOption}</div></td>
> -        <td><div class="tableheadtext">&nbsp;</div></td>
> -      </tr>
> -
> -      <#list categoryQuestions as question>
> -        <#assign questionType = question.getRelatedOne("SurveyQuestionType")>
> -        <form method="post" action="<@ofbizUrl>createSurveyQuestionAppl</@ofbizUrl>">
> -          <input type="hidden" name="surveyId" value="${requestParameters.surveyId}">
> -          <input type="hidden" name="surveyQuestionId" value="${question.surveyQuestionId}">
> -          <input type="hidden" name="surveyQuestionCategoryId" value="${requestParameters.surveyQuestionCategoryId}">
> -          <tr valign="middle">
> -            <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${question.surveyQuestionId}&surveyQuestionCategoryId=${requestParameters.surveyQuestionCategoryId}#edit</@ofbizUrl>" class="buttontext">${question.surveyQuestionId}</a></td>
> -            <td><div class="tabletext">${question.description?if_exists}</div></td>
> -            <td><div class="tabletext">${questionType.get("description",locale)}</div></td>
> -            <td><div class="tabletext">${question.question?if_exists}</div></td>
> -          <td>
> -            <select class="selectBox" name="surveyPageId">
> -              <option value=""></option>
> -              <#list surveyPageList as surveyPage>
> -                <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName} [${surveyPage.surveyPageSeqId}]</option>
> -              </#list>
> -            </select>
> -          </td>
> -          <td>
> -            <select class="selectBox" name="surveyMultiRespId">
> -              <option value=""></option>
> -              <#list surveyMultiRespList as surveyMultiResp>
> -                <option value="${surveyMultiResp.surveyMultiRespId}">${surveyMultiResp.multiRespTitle} [${surveyMultiResp.surveyMultiRespId}]</option>
> -              </#list>
> -            </select>
> -          </td>
> -            <td><input type="text" name="surveyMultiRespColId" size="4" class="inputBox"/></td>
> -            <td>
> -              <select name="requiredField" class="selectBox">
> -                <option>N</option>
> -                <option>Y</option>
> -              </select>
> -            </td>
> -            <td><input type="text" name="sequenceNum" size="5" class="inputBox"/></td>
> -            <td><input type="text" name="withSurveyQuestionId" size="5" class="inputBox"/></td>
> -            <td><input type="text" name="withSurveyOptionSeqId" size="5" class="inputBox"/></td>
> -            <td><input type="submit" value="${uiLabelMap.CommonApply}" class="smallSubmit"/></td>
> -          </tr>
> -        </form>
> -      </#list>
> -    </table>
> -    <br/>
> -  </#if>
> -
> -  <hr class="sepbar">
> -  <h2>${uiLabelMap.SurveyApplyQuestionFromCategory}</h2>
> -  <br/>
> -  <form method="post" action="<@ofbizUrl>EditSurveyQuestions</@ofbizUrl>">
> -    <input type="hidden" name="surveyId" value="${requestParameters.surveyId}"/>
> -    <select name="surveyQuestionCategoryId" class="selectBox">
> -      <#list questionCategories as category>
> -        <option value="${category.surveyQuestionCategoryId}">${category.description?default("??")} [${category.surveyQuestionCategoryId}]</option>
> -      </#list>
> -    </select>
> -    &nbsp;
> -    <input type="submit" value="${uiLabelMap.CommonApply}" class="smallSubmit"/>
> -  </form>
> -  <br/>
> -
> -  <hr class="sepbar">
> -  <a name="edit">
> +  </div>
> +</div>
> +<div class="screenlet">
>    <#-- new question / category -->
>    <#if requestParameters.newCategory?default("N") == "Y">
> -    <h2>${uiLabelMap.SurveyCreateQuestionCategory}</h2>
> -    <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion}</a>
> -    <br/><br/>
> -    ${createSurveyQuestionCategoryWrapper.renderFormString(context)}
> +    <div class="screenlet-title-bar">
> +      <ul>
> +        <li class="head3">${uiLabelMap.SurveyCreateQuestionCategory}</li>
> +      </ul>
> +      <br class="clear"/>
> +    </div>  
> +    <div class="screenlet-body">
> +      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion}</a>
> +      <br/><br/>
> +      ${createSurveyQuestionCategoryWrapper.renderFormString(context)}
>    <#else>
>      <#if surveyQuestionId?has_content>
> -      <h2>${uiLabelMap.CommonEdit} ${uiLabelMap.SurveyQuestion}:</h2>
> +    <div class="screenlet-title-bar">
> +      <ul>
> +        <li class="head3">${uiLabelMap.CommonEdit} ${uiLabelMap.SurveyQuestion}</li>
> +      </ul>
> +      <br class="clear"/>
> +    </div>  
> +    <div class="screenlet-body">  
>        <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion}</a>
>      <#else>
> -      <h2>${uiLabelMap.SurveyCreateQuestion}</h2>
> +    <div class="screenlet-title-bar">
> +      <ul>
> +        <li class="head3">${uiLabelMap.SurveyCreateQuestion}</li>
> +      </ul>
> +      <br class="clear"/>
> +    </div>  
> +    <div class="screenlet-body">
>      </#if>
>      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&newCategory=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion} ${uiLabelMap.SurveryCategory}</a>
>      <br/><br/>
>      ${createSurveyQuestionWrapper.renderFormString(context)}
>    </#if>
> -
> -  <#if (surveyQuestion?has_content && surveyQuestion.surveyQuestionTypeId?default("") == "OPTION")>
> -    <br/>
> -    <hr class="sepbar">
> -    <br/>
> -    <h1>${uiLabelMap.SurveyOptions} - <span class="head2">${uiLabelMap.CommonId}: ${surveyQuestion.surveyQuestionId?if_exists}</h1>
> -    <br/><br/>
> -    <table border="1" cellpadding='2' cellspacing='0'>
> -      <tr>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
> -        <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td>
> -        <td><div class="tableheadtext">&nbsp;</div></td>
> -        <td><div class="tableheadtext">&nbsp;</div></td>
> +  </div>
> +</div>
> +<#if (surveyQuestion?has_content && surveyQuestion.surveyQuestionTypeId?default("") == "OPTION")>
> +<div class="screenlet">
> +  <div class="screenlet-title-bar">
> +    <ul>
> +      <li class="head3">${uiLabelMap.SurveyOptions} - ${uiLabelMap.CommonId} ${surveyQuestion.surveyQuestionId?if_exists}</li>
> +    </ul>
> +    <br class="clear"/>
> +  </div>  
> +  <div class="screenlet-body">
> +    <table class="basic-table hover-bar" cellspacing="0">
> +      <tr class="header-row">
> +        <td>${uiLabelMap.CommonDescription}</td>
> +        <td>${uiLabelMap.CommonSequenceNum}</td>
> +        <td>&nbsp;</td>
> +        <td>&nbsp;</td>
>        </tr>
> -
> +      <#assign alt_row = false>
>        <#list questionOptions as option>
> -        <tr valign="middle">
> -          <td><div class="tabletext">${option.description?if_exists}</div></td>
> -          <td><div class="tabletext">${option.sequenceNum?if_exists}</div></td>
> -          <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a>
> -          <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
> +        <tr<#if alt_row> class="alternate-row"</#if>>
> +          <td>${option.description?if_exists}</td>
> +          <td>${option.sequenceNum?if_exists}</td>
> +          <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
> +          <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
>          </tr>
> +        <#assign alt_row = !alt_row>
>        </#list>
>      </table>
> -    <br/>
> +  </div>
> +</div>
> +<div class="screenlet">
>      <#if !surveyQuestionOption?has_content>
> -      <h2>${uiLabelMap.SurveyCreateQuestionOption}:</h2>
> +    <div class="screenlet-title-bar">
> +      <ul>
> +        <li class="head3">${uiLabelMap.SurveyCreateQuestionOption}</li>
> +      </ul>
> +      <br class="clear"/>
> +    </div>  
> +    <div class="screenlet-body">
>      <#else>
> -      <h2>${uiLabelMap.SurveyEditQuestionOption}:</h2>
> +    <div class="screenlet-title-bar">
> +      <ul>
> +        <li class="head3">${uiLabelMap.SurveyEditQuestionOption}}</li>
> +      </ul>
> +      <br class="clear"/>
> +    </div>  
> +    <div class="screenlet-body">
>        <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionOption.surveyQuestionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.SurveyOption}]</a>
>      </#if>
>      ${createSurveyOptionWrapper.renderFormString()}
>    </#if>
> +    </div>
> +</div>
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original)
> +++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Fri Feb  1 05:48:17 2008
> @@ -21,20 +21,22 @@
>  <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
>          xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
>  
> -    <form name="FindSurvey" default-map-name="survey" target="FindSurvey" title="" type="single">
> +    <form name="FindSurvey" default-map-name="survey" target="FindSurvey" title="" type="single"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="Survey" default-field-type="find"/>
>          
>          <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
>          <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
>          <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
> -        <field name="acroFormContentId"> 	 
> +        <field name="acroFormContentId">      
>              <lookup target-form-name="LookupContent"/>
>          </field>
>          
>          <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
>          <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="ListFindSurvey" target="" title="" list-name="listIt" type="list" paginate-target="FindSurvey" paginate="true">
> +    <form name="ListFindSurvey" target="" title="" list-name="listIt" type="list" paginate-target="FindSurvey" paginate="true"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
>                  <field-map field-name="inputFields" env-name="parameters"/>
> @@ -46,8 +48,8 @@
>              <hyperlink description="${surveyId}" target="EditSurvey?surveyId=${surveyId}" also-hidden="false"/>
>          </field>
>      </form>
> -    <form name="EditSurvey" type="single" target="updateSurvey" title="" default-map-name="survey">
> -        
> +    <form name="EditSurvey" type="single" target="updateSurvey" title="" default-map-name="survey"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <alt-target use-when="survey==null" target="createSurvey"/>
>          
>          <auto-fields-service service-name="updateSurvey"/>
> @@ -60,7 +62,7 @@
>          <field name="allowMultiple"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
>          <field name="allowUpdate"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
>  
> -        <field name="acroFormContentId" use-when="survey!=null"> 	 
> +        <field name="acroFormContentId" use-when="survey!=null">      
>              <lookup target-form-name="LookupContent"/>
>          </field>
>          <field name="acroFormContentId" use-when="survey==null"><ignored/></field>
> @@ -68,17 +70,17 @@
>          <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
>  
> -    <form name="BuildSurveyFromPdf" type="single" target="buildSurveyFromPdf" title="" default-map-name="survey">
> -        
> +    <form name="BuildSurveyFromPdf" type="single" target="buildSurveyFromPdf" title="" default-map-name="survey"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <field name="surveyId" map-name="survey"><hidden/></field>
> -        <field name="contentId" map-name="empty" title="${uiLabelMap.ContentPDF}"> 	 
> +        <field name="contentId" map-name="empty" title="${uiLabelMap.ContentPDF}">      
>              <lookup target-form-name="LookupContent"/>
>          </field>
>          <field name="submitButton" title="${uiLabelMap.SurveyGenerateQuestions}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
>  
> -    <form name="BuildSurveyResponseFromPdf" type="single" target="buildSurveyResponseFromPdf" title="" default-map-name="survey">
> -        
> +    <form name="BuildSurveyResponseFromPdf" type="single" target="buildSurveyResponseFromPdf" title="" default-map-name="survey"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <field name="surveyId" map-name="parameters"><hidden/></field>
>          <field name="surveyResponseId" map-name="surveyResponse"><hidden/></field>
>          <field name="pdfFileNameIn" map-name="empty"><text/></field>
> @@ -90,7 +92,8 @@
>      </form>
>  
>      <!-- SurveyMultiResp & SurveyMultiRespColumn -->
> -    <form name="EditSurveyMultiResp" type="single" target="updateSurveyMultiResp" title="" default-map-name="surveyMultiResp">
> +    <form name="EditSurveyMultiResp" type="single" target="updateSurveyMultiResp" title="" default-map-name="surveyMultiResp"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-service service-name="updateSurveyMultiResp" default-field-type="edit"/>
>          
>          <field name="surveyId"><hidden/></field>
> @@ -98,7 +101,8 @@
>          
>          <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="ListSurveyMultiRespColumns" type="list" target="updateSurveyMultiRespColumn" title="" list-name="surveyMultiRespColumnList">
> +    <form name="ListSurveyMultiRespColumns" type="list" target="updateSurveyMultiRespColumn" title="" list-name="surveyMultiRespColumnList"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <entity-condition entity-name="SurveyMultiRespColumn">
>                  <condition-list combine="and">
> @@ -117,14 +121,16 @@
>          
>          <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="AddSurveyMultiRespColumn" type="single" target="createSurveyMultiRespColumn" title="">
> +    <form name="AddSurveyMultiRespColumn" type="single" target="createSurveyMultiRespColumn" title=""
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-service service-name="createSurveyMultiRespColumn" default-field-type="edit"/>
>          
>          <field name="surveyId" map-name="surveyMultiResp"><hidden/></field>
>          <field name="surveyMultiRespId" map-name="surveyMultiResp"><hidden/></field>
>          <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="AddSurveyMultiResp" type="single" target="createSurveyMultiResp" title="">
> +    <form name="AddSurveyMultiResp" type="single" target="createSurveyMultiResp" title=""
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-service service-name="createSurveyMultiResp" default-field-type="edit"/>
>          
>          <field name="surveyId" map-name="survey"><hidden/></field>
> @@ -132,7 +138,8 @@
>      </form>
>      
>      <!-- SurveyPage -->
> -    <form name="ListSurveyPages" type="list" target="updateSurveyPage" title="" list-name="surveyPageList">
> +    <form name="ListSurveyPages" type="list" target="updateSurveyPage" title="" list-name="surveyPageList"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <entity-condition entity-name="SurveyPage">
>                  <condition-expr field-name="surveyId" env-name="surveyId"/>
> @@ -147,7 +154,8 @@
>  
>          <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="AddSurveyPage" type="single" target="createSurveyPage" title="" default-map-name="surveyPage">
> +    <form name="AddSurveyPage" type="single" target="createSurveyPage" title="" default-map-name="surveyPage"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-service service-name="createSurveyPage" default-field-type="edit"/>
>          
>          <field name="surveyId"><hidden/></field>
> @@ -155,8 +163,8 @@
>          <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
>      
> -    <form name="ListSurveyQuestions" type="list" target="updateSurveyQuestion" title="" list-name="surveyQuestionList" list-entry-name="surveyQuestion">
> -        
> +    <form name="ListSurveyQuestions" type="list" target="updateSurveyQuestion" title="" list-name="surveyQuestionList" list-entry-name="surveyQuestion"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <auto-fields-service service-name="updateSurveyQuestion" map-name="surveyQuestion"/>
>  
>          <field name="surveyId"><hidden/></field>
> @@ -171,7 +179,8 @@
>                  
>          <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="CreateSurveyQuestion" type="single" target="createSurveyQuestion" title="" default-map-name="surveyQuestion">
> +    <form name="CreateSurveyQuestion" type="single" target="createSurveyQuestion" title="" default-map-name="surveyQuestion"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <alt-target use-when="surveyQuestion!=null" target="updateSurveyQuestion"/>
>          <auto-fields-service service-name="createSurveyQuestion"/>
>  
> @@ -192,8 +201,8 @@
>          <field use-when="surveyQuestion!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>          <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="CreateSurveyQuestionCategory" type="single" target="createSurveyQuestionCategory" title="">
> -
> +    <form name="CreateSurveyQuestionCategory" type="single" target="createSurveyQuestionCategory" title=""
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-service service-name="createSurveyQuestionCategory"/>
>          <field name="surveyId"><hidden value="${surveyId}"/></field>
>          <field name="parentCategoryId">
> @@ -205,7 +214,8 @@
>          </field>
>          <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="CreateSurveyQuestionOption" type="single" target="createSurveyQuestionOption" title="" default-map-name="surveyQuestionOption">
> +    <form name="CreateSurveyQuestionOption" type="single" target="createSurveyQuestionOption" title="" default-map-name="surveyQuestionOption"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <alt-target use-when="surveyQuestionOption!=null" target="updateSurveyQuestionOption"/>
>          <auto-fields-service service-name="createSurveyQuestionOption"/>
>  
> @@ -234,13 +244,15 @@
>          <field use-when="surveyQuestionOption==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
>  
> -    <form name="FindSurveyResponse" target="FindSurveyResponse" title="" type="single">
> +    <form name="FindSurveyResponse" target="FindSurveyResponse" title="" type="single"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="SurveyResponse" default-field-type="find"/>
>          
>          <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
>          <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="ListFindSurveyResponse" list-name="listIt" title="" type="list" paginate-target="FindSurveyResponse">
> +    <form name="ListFindSurveyResponse" list-name="listIt" title="" type="list" paginate-target="FindSurveyResponse"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
>                  <field-map field-name="inputFields" env-name="parameters"/>
> @@ -253,7 +265,8 @@
>          </field>
>      </form>
>      
> -    <form name="lookupSurvey" target="LookupSurvey" title="" type="single">
> +    <form name="lookupSurvey" target="LookupSurvey" title="" type="single"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="Survey" default-field-type="find"/>
>          <field name="surveyId" title="${uiLabelMap.SurveySurveyId}"><text-find/></field>
>          <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
> @@ -263,7 +276,8 @@
>          <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
>          <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="listLookupSurvey" list-name="listIt" title="" type="list" paginate-target="LookupSurvey">
> +    <form name="listLookupSurvey" list-name="listIt" title="" type="list" paginate-target="LookupSurvey"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
>                  <field-map field-name="inputFields" env-name="parameters"/>
> @@ -276,13 +290,15 @@
>          </field>
>      </form>
>  
> -    <form name="lookupSurveyResponse" target="LookupSurveyResponse" title="" type="single">
> +    <form name="lookupSurveyResponse" target="LookupSurveyResponse" title="" type="single"
> +        header-row-style="header-row" default-table-style="basic-table">
>          <auto-fields-entity entity-name="SurveyResponse" default-field-type="find"/>
>  
>          <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
>          <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
>      </form>
> -    <form name="listLookupSurveyResponse" list-name="listIt" title="" type="list" paginate-target="LookupSurveyResponse">
> +    <form name="listLookupSurveyResponse" list-name="listIt" title="" type="list" paginate-target="LookupSurveyResponse"
> +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
>          <actions>
>              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
>                  <field-map field-name="inputFields" env-name="parameters"/>
> @@ -294,4 +310,4 @@
>              <hyperlink also-hidden="false" target-type="plain" description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')"/>
>          </field>
>      </form>
> -</forms>
> +</forms>
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl (original)
> +++ ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl Fri Feb  1 05:48:17 2008
> @@ -17,7 +17,7 @@
>  under the License.
>  -->
>  
> -  <table width="100%" border="0" cellpadding="2" cellspacing="0">
> +  <table class="basic-table hover-bar" cellspacing="0">
>      <#assign questions = surveyWrapper.getSurveyQuestionAndAppls()>
>      <#assign surveyResults = surveyWrapper.getResults(questions)>
>  
> @@ -28,20 +28,20 @@
>          <tr>
>            <#-- seperator options -->
>            <#if question.surveyQuestionTypeId == "SEPERATOR_TEXT">
> -            <td colspan="5"><div class="tabletext">${question.question?if_exists}</div></td>
> +            <td colspan="5" class="label">${question.question?if_exists}</td>
>            <#elseif question.surveyQuestionTypeId == "SEPERATOR_LINE">
> -            <td colspan="5"><hr class="sepbar"></td>
> +            <td colspan="5"><hr></td>
>            <#else>
>  
>              <#-- standard questions -->
> -            <td align='right' nowrap>
> +            <td align='right' nowrap class="label">
>                <#assign answerString = "${uiLabelMap.ContentAnswers}">
>                <#if (results._total?default(0) == 1)>
>                  <#assign answerString = "${uiLabelMap.ContentAnswer}">
>                </#if>
> -              <div class="tabletext">${question.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div>
> +              <div>${question.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div>
>                <#if question.hint?has_content>
> -                <div class="tabletext">${question.hint}</div>
> +                <div>${question.hint}</div>
>                </#if>
>              </td>
>              <td width='1'>&nbsp;</td>
> @@ -50,10 +50,10 @@
>              <td>
>                <#if question.surveyQuestionTypeId == "BOOLEAN">
>                  <#assign selectedOption = (answer.booleanResponse)?default("Y")>
> -                <div class="tabletext">
> +                <div>
>                    <span style="white-space: nowrap;">${uiLabelMap.CommonY}&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]</span>
>                  </div>
> -                <div class="tabletext">
> +                <div>
>                    <span style="white-space: nowrap;">${uiLabelMap.CommonN}&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</span>
>                  </div>
>                <#elseif question.surveyQuestionTypeId == "OPTION">
> @@ -61,7 +61,7 @@
>                  <#if options?has_content>
>                    <#list options as option>
>                      <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists>
> -                    <div class="tabletext">
> +                    <div>
>                        <span style="white-space: nowrap;">
>                          ${option.description?if_exists}
>                          &nbsp;[${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%]
> @@ -74,29 +74,29 @@
>                  <#if answers?has_content>
>                    <#list answers as answer>
>                      <#if question.surveyQuestionTypeId == "TEXTAREA">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "TEXT_SHORT">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "TEXT_LONG">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "EMAIL">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "URL">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "DATE">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "CREDIT_CARD">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "GIFT_CARD">
> -                      <div class="tabletext">${(answer.textResponse)?if_exists}</div>
> +                      <div>${(answer.textResponse)?if_exists}</div>
>                      <#elseif question.surveyQuestionTypeId == "NUMBER_CURRENCY">
> -                      <div class="tabletext">${answer.currencyResponse?default(0)}</div>
> +                      <div>${answer.currencyResponse?default(0)}</div>
>                      <#elseif question.surveyQuestionTypeId == "NUMBER_FLOAT">
> -                      <div class="tabletext">${answer.floatResponse?default(0)?string("#")}</div>
> +                      <div>${answer.floatResponse?default(0)?string("#")}</div>
>                      <#elseif question.surveyQuestionTypeId == "NUMBER_LONG">
> -                      <div class="tabletext">${answer.numericResponse?default(0)?string("#")}&nbsp;[${uiLabelMap.CommonTally}: ${results._tally?default(0)?string("#")} / ${uiLabelMap.CommonAverage}: ${results._average?default(0)?string("#")}]</div>
> +                      <div>${answer.numericResponse?default(0)?string("#")}&nbsp;${uiLabelMap.CommonTally}: ${results._tally?default(0)?string("#")} / ${uiLabelMap.CommonAverage}: ${results._average?default(0)?string("#")}</div>
>                      <#elseif question.surveyQuestionTypeId == "PASSWORD">
> -                      <div class="tabletext">[${uiLabelMap.CommonNotShown}]</div>
> +                      <div>${uiLabelMap.CommonNotShown}</div>
>                      <#elseif question.surveyQuestionTypeId == "CONTENT">
>                         <#if answer.contentId?has_content>
>                           <#assign content = answer.getRelatedOne("Content")>
> @@ -107,7 +107,6 @@
>                  </#if>
>                </#if>
>              </td>
> -
>              <td width="90%">&nbsp;</td>
>            </#if>
>          </tr>
> @@ -115,7 +114,7 @@
>        </#list>
>      <#else>
>        <tr>
> -        <td><div class="tabletext">${uiLabelMap.SurveyNoQuestions}</div></td>
> +        <td class="label">${uiLabelMap.SurveyNoQuestions}</div></td>
>        </tr>
>      </#if>
> -  </table>
> +  </table>
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
> +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Fri Feb  1 05:48:17 2008
> @@ -69,8 +69,8 @@
>  
>  <#-- content info -->
>  <#if (!content?has_content)>
> -    <div class="tabletext" style="margin-bottom: 8px;">
> -        New <b>${contentAssocTypeId?default("SUBSITE")}</b> attached to Content: ${contentIdFrom?default(contentRoot)}</b>
> +    <div style="margin-bottom: 8px;">
> +        ${uiLabelMap.CommonNew} <span class="label">${contentAssocTypeId?default("SUBSITE")}</span> ${uiLabelMap.ContentWebSiteAttachedToContent} ${contentIdFrom?default(contentRoot)}
>      </div>
>  </#if>
>  
> @@ -84,23 +84,23 @@
>          <form name="cmsdatatype">
>              <table>
>                  <tr>
> -                    <td><div class="tableheadtext">Data Type</div></td>
> +                    <td class="label">${uiLabelMap.ContentDataType}</td>
>                      <td>            
> -                        <select class="inputBox" name="dataResourceTypeId">
> -                            <option value="NONE">None (Tree, Category, etc)</option>
> -                            <option value="SHORT_TEXT">Short Text (255 chars.)</option>
> -                            <option value="ELECTRONIC_TEXT">Long Text</option>
> -                            <option value="URL_RESOURCE">URL Resource</option>
> -                            <option value="IMAGE_OBJECT">Image</option>
> -                            <option value="VIDEO_OBJECT">Video</option>
> -                            <option value="AUDIO_OBJECT">Audio</option>
> -                            <option value="OTHER_OBJECT">Other</option>
> +                        <select name="dataResourceTypeId">
> +                            <option value="NONE">${uiLabelMap.ContentResourceNone}</option>
> +                            <option value="SHORT_TEXT">${uiLabelMap.ContentResourceShortText}</option>
> +                            <option value="ELECTRONIC_TEXT">${uiLabelMap.ContentResourceLongText}</option>
> +                            <option value="URL_RESOURCE">${uiLabelMap.ContentResourceUrlResource}</option>
> +                            <option value="IMAGE_OBJECT">${uiLabelMap.ContentResourceImage}</option>
> +                            <option value="VIDEO_OBJECT">${uiLabelMap.ContentResourceVideo}</option>
> +                            <option value="AUDIO_OBJECT">${uiLabelMap.ContentResourceAudio}</option>
> +                            <option value="OTHER_OBJECT">${uiLabelMap.ContentResourceOther}</option>
>                          </select>
>                      </td>
>                  </tr>
>                  <tr>
>                      <td align="center" colspan="2">
> -                        <a href="javascript:void(0);" onclick="javascript:selectDataType('${contentIdFrom?default(contentRoot)}');" class="buttontext">Continue</a>
> +                        <a href="javascript:void(0);" onclick="javascript:selectDataType('${contentIdFrom?default(contentRoot)}');" class="buttontext">${uiLabelMap.CommonContinue}</a>
>                      </td>
>                  </tr>
>                  <#list 0..15 as x>
> @@ -165,32 +165,32 @@
>          <table>
>            <#if (content?has_content)>
>              <tr>
> -                <td><div class="tableheadtext">Content ID</div></td>
> -                <td><div class="tabletext">${content.contentId}</div></td>
> +                <td class="label">${uiLabelMap.FormFieldTitle_contentId}</td>
> +                <td>${content.contentId}</td>
>              </tr>
>            </#if>
>            <tr>
> -            <td><div class="tableheadtext">Name</div></td>
> +            <td class="label">${uiLabelMap.CommonName}</td>
>              <td>
> -                <input type="text" name="contentName" class="inputBox" value="${(content.contentName)?if_exists}" size="40"/>
> +                <input type="text" name="contentName" value="${(content.contentName)?if_exists}" size="40"/>
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Description</div></td>
> +            <td class="label">${uiLabelMap.CommonDescription}</td>
>              <td>
> -                <textarea name="description" class="inputBox" cols="40" rows="6">${(content.description)?if_exists}</textarea>
> +                <textarea name="description" cols="40" rows="6">${(content.description)?if_exists}</textarea>
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Key</div></td>
> +            <td class="label">${uiLabelMap.CommonKey}</td>
>              <td>
> -                <input type="text" name="mapKey" class="inputBox" value="${(assoc.mapKey)?if_exists}" size="40"/>
> +                <input type="text" name="mapKey" value="${(assoc.mapKey)?if_exists}" size="40"/>
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Purpose</div></td>
> +            <td class="label">${uiLabelMap.CommonPurpose}</td>
>              <td>
> -                <select name="contentPurposeTypeId" class="selectBox">
> +                <select name="contentPurposeTypeId">
>                      <#if (currentPurposes?has_content)>
>                          <#assign purpose = currentPurposes[0].getRelatedOne("ContentPurposeType")/>
>                          <option value="${purpose.contentPurposeTypeId}">${purpose.description?default(purpose.contentPurposeTypeId)}</option>
> @@ -206,9 +206,9 @@
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Data Type</div></td>
> +            <td class="label">${uiLabelMap.ContentDataType}</td>
>              <td>
> -                <select name="dataTemplateTypeId" class="selectBox">
> +                <select name="dataTemplateTypeId">
>                      <#if (dataResource?has_content)>
>                          <#if (dataResource.dataTemplateTypeId?has_content)>
>                              <#assign thisType = dataResource.getRelatedOne("DataTemplateType")?if_exists/>
> @@ -223,9 +223,9 @@
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Decorator</div></td>
> +            <td class="label">${uiLabelMap.ContentDecorator}</td>
>              <td>
> -                <select name="decoratorContentId" class="selectBox">
> +                <select name="decoratorContentId">
>                      <#if (content?has_content)>
>                          <#if (content.decoratorContentId?has_content)>
>                              <#assign thisDec = content.getRelatedOne("DecoratorContent")/>
> @@ -233,7 +233,7 @@
>                              <option value="${thisDec.contentId}">----</option>
>                          </#if>
>                      </#if>
> -                    <option value="">None</option>
> +                    <option value="">${uiLabelMap.ContentResourceNone}</option>
>                      <#list decorators as decorator>
>                          <option value="${decorator.contentId}">${decorator.contentName}</option>
>                      </#list>
> @@ -241,9 +241,9 @@
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Template</div></td>
> +            <td class="label">${uiLabelMap.ContentTemplate}</td>
>              <td>
> -                <select name="templateDataResourceId" class="selectBox">
> +                <select name="templateDataResourceId">
>                      <#if (content?has_content)>
>                          <#if (content.templateDataResourceId?has_content && content.templateDataResourceId != "NONE")>
>                              <#assign template = content.getRelatedOne("TemplateDataResource")/>
> @@ -251,7 +251,7 @@
>                              <option value="${template.dataResourceId}">----</option>
>                          </#if>
>                      </#if>
> -                    <option value="">None</option>
> +                    <option value="">${uiLabelMap.ContentResourceNone}</option>
>                      <#list templates as template>
>                          <option value="${template.dataResourceId}">${template.dataResourceName}</option>
>                      </#list>
> @@ -259,9 +259,9 @@
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Status</div></td>
> +            <td class="label">${uiLabelMap.CommonStatus}</td>
>              <td>
> -                <select name="statusId" class="selectBox">
> +                <select name="statusId">
>                      <#if (content?has_content)>
>                          <#if (content.statusId?has_content)>
>                              <#assign statusItem = content.getRelatedOne("StatusItem")/>
> @@ -276,9 +276,9 @@
>              </td>
>            </tr>
>            <tr>
> -            <td><div class="tableheadtext">Is Public</div></td>
> +            <td class="label">${uiLabelMap.FormFieldTitle_isPublic}</td>
>              <td>
> -                <select name="isPublic" class="selectBox">
> +                <select name="isPublic">
>                      <#if (dataResource?has_content)>
>                          <#if (dataResource.isPublic?has_content)>
>                              <option>${dataResource.isPublic}</option>
> @@ -294,7 +294,7 @@
>            </tr>
>            <tr>
>              <td colspan="2">
> -              <textarea id="cmsdata" name="textData" class="inputBox" cols="40" rows="6" style="display: none;">
> +              <textarea id="cmsdata" name="textData" cols="40" rows="6" style="display: none;">
>                  <#if (dataText?has_content)>
>                      ${dataText.textData}
>                  </#if>
> @@ -313,24 +313,24 @@
>                </td>
>              </tr>
>              <tr>
> -              <td><div class="tableheadtext">Upload</div></td>
> +              <td class="label">${uiLabelMap.CommonUpload}</td>
>                <td>
>                  <input type="hidden" name="isUploadObject" value="Y"/>
> -                <input type="file" name="uploadedFile" class="inputBox" size="30"/>
> +                <input type="file" name="uploadedFile" size="30"/>
>                </td>
>              </tr>
>            <#elseif (dataResourceTypeId == 'URL_RESOURCE')>
>              <tr>
> -              <td><div class="tableheadtext">URL</div></td>
> +              <td class="label">${uiLabelMap.ContentURL}</td>
>                <td>
> -                <input type="text" name="objectInfo" class="inputBox" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/>
> +                <input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/>
>                </td>
>              </tr>
>            <#elseif (dataResourceTypeId == 'SHORT_TEXT')>
>              <tr>
> -              <td><div class="tableheadtext">Text</div></td>
> +              <td class="label">${uiLabelMap.ContentText}</td>
>                <td>
> -                <input type="text" name="objectInfo" class="inputBox" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/>
> +                <input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/>
>                </td>
>              </tr>
>            <#elseif (dataResourceTypeId == 'ELECTRONIC_TEXT')>
> @@ -345,7 +345,7 @@
>  
>            <tr>
>              <td align="center" colspan="2">
> -                <a href="javascript:void(0);" onclick="javascript:cmsSave();" class="buttontext">Save</a>
> +                <a href="javascript:void(0);" onclick="javascript:cmsSave();" class="buttontext">${uiLabelMap.CommonSave}</a>
>              </td>
>            </tr>
>          </table>
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl (original)
> +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl Fri Feb  1 05:48:17 2008
> @@ -36,7 +36,7 @@
>  </div>
>  
>  <#if (content?has_content)>
> -    <div class="tabletext" style="margin-bottom: 8px;">
> +    <div style="margin-bottom: 8px;">
>          Set <b>Meta-Data</b> for Content: <b>${content.contentId}</b></b>
>      </div>
>  </#if>
> @@ -106,24 +106,24 @@
>  <form name="cmsmetaform" action="javascript:void(0);" style="margin: 0;">
>      <table>        
>          <tr>
> -            <td><div class="tableheadtext">Page Title</div></td>
> -            <td><input type="text" class="inputBox" name="title" value="${(title.objectInfo)?if_exists}" size="40"></td>
> +            <td class="label">Page Title</td>
> +            <td><input type="text" name="title" value="${(title.objectInfo)?if_exists}" size="40"></td>
>          </tr>
>          <tr>
> -            <td><div class="tableheadtext">Title Property</div></td>
> -            <td><input type="text" class="inputBox" name="titleProperty" value="${(titleProperty.objectInfo)?if_exists}" size="40"></td>
> +            <td class="label">Title Property</td>
> +            <td><input type="text" name="titleProperty" value="${(titleProperty.objectInfo)?if_exists}" size="40"></td>
>          </tr>
>          <tr>
> -            <td><div class="tableheadtext">Meta-Description</div></td>
> -            <td><input type="text" class="inputBox" name="metaDescription" value="${(metaDescription.objectInfo)?if_exists}" size="40"></td>
> +            <td class="label">Meta-Description</td>
> +            <td><input type="text" name="metaDescription" value="${(metaDescription.objectInfo)?if_exists}" size="40"></td>
>          </tr>
>          <tr>
> -            <td><div class="tableheadtext">Meta-Keywords</div></td>
> -            <td><input type="text" class="inputBox" name="metaKeywords" value="${(metaKeywords.objectInfo)?if_exists}" size="40"></td>
> +            <td class="label">Meta-Keywords</td>
> +            <td><input type="text" name="metaKeywords" value="${(metaKeywords.objectInfo)?if_exists}" size="40"></td>
>          </tr>
>          <tr><td colspan="2">&nbsp;</td></tr>        
>          <tr>
>              <td colspan="2" align="center"><input id="submit" type="button" onclick="javascript:saveMetaInfo(cmsmetaform);" class="smallSubmit" value="Save"/></td>
>          </tr>
>      </table>
> -</form>
> +</form>
> \ No newline at end of file
> 
> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=617499&r1=617498&r2=617499&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
> +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Fri Feb  1 05:48:17 2008
> @@ -28,19 +28,19 @@
>  
>      var treeSelected = false;
>      var contentRoot = '${contentRoot?if_exists}';
> -	var webSiteId = '${webSiteId?if_exists}';        
> +    var webSiteId = '${webSiteId?if_exists}';        
>      var editorUrl = '<@ofbizUrl>/views/WebSiteCMSContent</@ofbizUrl>';
>      var aliasUrl = '<@ofbizUrl>/views/WebSiteCMSPathAlias</@ofbizUrl>';
>      var metaUrl = '<@ofbizUrl>/views/WebSiteCMSMetaInfo</@ofbizUrl>';
>          
>      dojo.addOnLoad(function() {
> -		dojo.event.topic.subscribe("webCmsNodeSelected",
> -			 function(message) {
> -			    treeSelected = true;
> +        dojo.event.topic.subscribe("webCmsNodeSelected",
> +             function(message) {
> +                treeSelected = true;
>                  callEditor(false, message.node.widgetId, message.node.object);
> -			 }
> -		);
> -		dojo.event.topic.subscribe("newLong/engage",
> +             }
> +        );
> +        dojo.event.topic.subscribe("newLong/engage",
>              function (menuItem) {
>                  var node = menuItem.getTreeNode();
>                  callEditor(true, node.widgetId, '', 'ELECTRONIC_TEXT');
> @@ -83,14 +83,14 @@
>              }
>          );
>  
> -		var cmsdata = dojo.byId("cmsdata");
> -		if (cmsdata) {
> -		    createEditor(cmsdata.value);
> -		} else {
> -		    createEditor();
> +        var cmsdata = dojo.byId("cmsdata");
> +        if (cmsdata) {
> +            createEditor(cmsdata.value);
> +        } else {
> +            createEditor();
>          }
>          //alert("On load called!");
> -	});
> +    });
>  
>      function createEditor(text) {
>          var currentEditor = dojo.widget.byId("w_editor");
> @@ -187,10 +187,10 @@
>          dojo.io.bind(bindArgs);
>      }
>  
> -	function callEditor(sub, contentId, objstr, dataResourceTypeId) {
> -	    var ctx = new Array();
> -	    if (objstr != null && objstr.length > 0) {
> -	        var obj = objstr.split("|");
> +    function callEditor(sub, contentId, objstr, dataResourceTypeId) {
> +        var ctx = new Array();
> +        if (objstr != null && objstr.length > 0) {
> +            var obj = objstr.split("|");
>              ctx['contentIdFrom'] = obj[0];
>              ctx['contentAssocTypeId'] = obj[1];
>              ctx['fromDate'] = obj[2];
> @@ -336,8 +336,8 @@
>  
>  <style>
>  .dojoContextMenu {
> -	background-color: #ccc;
> -	font-size: 10px;
> +    background-color: #ccc;
> +    font-size: 10px;
>  }
>  </style>
>  
> @@ -367,11 +367,11 @@
>      <dt dojoType="TreeMenuItem" id="newObject" caption="New Object"/>
>  </dl>
>  
> -<div class="tableheadtext">
> -    Website Content
> +<div class="label">
> +    ${uiLabelMap.ContentWebSiteContent}
>  </div>
> -<div class="tabletext">
> -  *Right click to add sub-content
> +<div>
> +    ${uiLabelMap.ContentWebSiteAddSubdContent}
>  </div>
>  <div>&nbsp;</div>
>  
> @@ -382,7 +382,7 @@
>      </#if>
>  </div>
>  <#if (!subsites?has_content)>
> -    <a href="javascript:void(0);" class="linktext">Add Tree</a>
> +    <a href="javascript:void(0);" class="buttontext">${uiLabelMap.ContentWebSiteAddTree}</a>
>  </#if>
>  
>  <div>&nbsp;</div>
> @@ -393,11 +393,11 @@
>      <dt dojoType="TreeMenuItem" id="newMenu" caption="New Menu"/>    
>  </dl>
>  
> -<div class="tableheadtext">
> -    Website Menus
> +<div class="label">
> +    ${uiLabelMap.ContentWebSiteMenus}
>  </div>
> -<div class="tabletext">
> -  *Right click to add new menus
> +<div>
> +    ${uiLabelMap.ContentWebSiteAddNewMenus}
>  </div>
>  <div>&nbsp;</div>
>  
> @@ -409,6 +409,5 @@
>      </#if>
>  </div>
>  <#if (!menus?has_content)>
> -    <a href="javascript:void(0);" class="linktext">Add Menu</a>
> -</#if>
> -
> +    <a href="javascript:void(0);" class="buttontext">${uiLabelMap.ContentWebSiteAddMenu}</a>
> +</#if>
> \ No newline at end of file
> 
> 
> 

Mime
View raw message