[jboss-cvs] jboss-seam/examples/wiki/view ...

Christian Bauer christian at hibernate.org
Sat Dec 29 21:33:19 EST 2007


  User: cbauer  
  Date: 07/12/29 21:33:19

  Modified:    examples/wiki/view                             
                        dirDisplay_m.xhtml userInfo_m.xhtml
                        uploadCreate_d.xhtml search_d.xhtml
                        dirDisplay_d.xhtml tagDisplay_d.xhtml
                        dirEdit_m.xhtml userHome_d.xhtml docHistory_d.xhtml
                        adminHome_m.xhtml userInfo_d.xhtml
                        docDisplay_d.xhtml testtemplate.xhtml
                        docEdit_m.xhtml userRegister_m.xhtml
                        uploadEdit_m.xhtml tagDisplay_m.xhtml
                        adminHome_d.xhtml uploadEdit_d.xhtml
                        userList_d.xhtml dirEdit_d.xhtml docDisplay_m.xhtml
                        docEdit_d.xhtml search_m.xhtml docHistory_m.xhtml
                        userRegister_d.xhtml userList_m.xhtml
                        uploadCreate_m.xhtml userHome_m.xhtml
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.4       +8 -8      jboss-seam/examples/wiki/view/dirDisplay_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirDisplay_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_m.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- dirDisplay_m.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ dirDisplay_m.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">#{directoryHome.instance.name}</ui:define>
   
  @@ -101,7 +101,7 @@
                   rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}">
               <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/>
               <h:panelGrid columns="2">
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/>
                   <h:outputText value=".."/>
               </h:panelGrid>
           </s:link>
  @@ -126,23 +126,23 @@
               <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" accesskey="."
                       rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}">
                   <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/>
               </s:link>
           </f:facet>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif"
                           width="18" height="20"
                           rendered="#{node.isInstance('WikiDirectory')}"/>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif"
                           width="18" height="20"
                           rendered="#{node.isInstance('WikiDocument') and node != directoryHome.instance.defaultFile}"/>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.default.gif"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.default.gif"
                           width="18" height="20"
                           rendered="#{node.isInstance('WikiDocument') and node == directoryHome.instance.defaultFile}"/>
   
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[node.contentType].displayIcon}"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[node.contentType].displayIcon}"
                           width="18" height="20"
                           rendered="#{node.isInstance('WikiUpload') and !empty uploadTypes[node.contentType]}"/>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}"
                           width="18" height="20"
                           rendered="#{node.isInstance('WikiUpload') and empty uploadTypes[node.contentType]}"/>
       </h:column>
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/view/userInfo_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userInfo_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userInfo_m.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- userInfo_m.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ userInfo_m.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userInfo.UserInfo']}"/>
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/view/uploadCreate_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: uploadCreate_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/uploadCreate_d.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- uploadCreate_d.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ uploadCreate_d.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -8,7 +8,7 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.upload.UploadFile']}"/>
  
  
  
  1.4       +10 -10    jboss-seam/examples/wiki/view/search_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: search_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search_d.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- search_d.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ search_d.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -8,7 +8,7 @@
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.search.Search']}: #{wikiSearch.simpleQuery}"/>
  @@ -148,16 +148,16 @@
   
                   <h:commandLink action="#{wikiSearch.firstPage()}" styleClass="sessionEventTrigger"
                                  rendered="#{wikiSearch.previousPageAvailable}" tabindex="7">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!wikiSearch.previousPageAvailable}"/>
   
                   <h:commandLink action="#{wikiSearch.previousPage()}" styleClass="sessionEventTrigger"
                                  rendered="#{wikiSearch.previousPageAvailable}" tabindex="7">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!wikiSearch.previousPageAvailable}"/>
   
                   <h:outputText value="#{wikiSearch.firstRow} #{messages['lacewiki.label.search.To']}
  @@ -166,16 +166,16 @@
   
                   <h:commandLink action="#{wikiSearch.nextPage()}" styleClass="sessionEventTrigger"
                                  rendered="#{wikiSearch.nextPageAvailable}" tabindex="7">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!wikiSearch.nextPageAvailable}"/>
   
                   <h:commandLink action="#{wikiSearch.lastPage()}" styleClass="sessionEventTrigger"
                                  rendered="#{wikiSearch.nextPageAvailable}" tabindex="7">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!wikiSearch.nextPageAvailable}"/>
   
               </h:panelGrid>
  @@ -194,7 +194,7 @@
                   <h:column>
   
                       <h:panelGrid columns="2">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{hit.icon}" width="18" height="20"/>
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{hit.icon}" width="18" height="20"/>
                           <h:outputLink value="#{hit.link}" tabindex="1"><h:outputText escape="false" value="#{hit.title}"/></h:outputLink>
                       </h:panelGrid>
                       <h:outputText styleClass="smallFont" escape="false" value="#{hit.fragment}"/>
  
  
  
  1.8       +24 -21    jboss-seam/examples/wiki/view/dirDisplay_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirDisplay_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_d.xhtml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- dirDisplay_d.xhtml	20 Dec 2007 12:34:53 -0000	1.7
  +++ dirDisplay_d.xhtml	30 Dec 2007 02:33:19 -0000	1.8
  @@ -5,7 +5,7 @@
                   xmlns:ui="http://java.sun.com/jsf/facelets"
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">#{directoryHome.instance.name}</ui:define>
   
  @@ -70,7 +70,7 @@
   
       <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
                     styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">
  -        <h:graphicImage styleClass="feedIcon" value="/themes/#{wikiPreferences.themeName}/img/icon.atom.gif" width="18" height="18"/>
  +        <h:graphicImage styleClass="feedIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/>
           <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/>
       </h:outputLink>
   
  @@ -101,7 +101,8 @@
       </script>
   
       <h:panelGrid columns="3"
  -                 styleClass="directoryControl" columnClasses="directoryPagerControl, directorySelectControl, directoryClipboard"
  +                 styleClass="directoryControl smallFont" 
  +                 columnClasses="directoryPagerControl, directorySelectControl, directoryClipboard"
                    cellpadding="0" cellspacing="0" border="0">
   
           <s:fragment>
  @@ -191,6 +192,7 @@
   
       <div class="directoryPathPanel">
           <h:panelGroup>
  +            <h:outputText value="/" styleClass="directorySeparator"/>
               <ui:repeat var="directory" value="#{directoryHome.instance.path}">
                   <s:link view="/dirDisplay_#{skin}.xhtml" value="#{directory.name}" styleClass="directoryButton" tabindex="1">
                       <f:param name="directoryId" value="#{directory.id}"/>
  @@ -205,7 +207,7 @@
                       rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}">
                   <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/>
                   <h:panelGrid columns="2">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/>
                       <h:outputText value=".."/>
                   </h:panelGrid>
               </s:link>
  @@ -224,18 +226,18 @@
                   rendered="#{directoryHome.pager.previousPageAvailable}">
               <f:param name="page" value="0"/>
               <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/>
           </s:link>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                           rendered="#{!directoryHome.pager.previousPageAvailable}"/>
   
           <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" target="_top"
                   rendered="#{directoryHome.pager.previousPageAvailable}">
               <f:param name="page" value="#{directoryHome.pager.previousPage}"/>
               <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/>
           </s:link>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                           rendered="#{!directoryHome.pager.previousPageAvailable}"/>
   
           <s:span>
  @@ -249,18 +251,18 @@
                   rendered="#{directoryHome.pager.nextPageAvailable}">
               <f:param name="page" value="#{directoryHome.pager.nextPage}"/>
               <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/>
           </s:link>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                           rendered="#{!directoryHome.pager.nextPageAvailable}"/>
   
           <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" target="_top"
                   rendered="#{directoryHome.pager.nextPageAvailable}">
               <f:param name="page" value="#{directoryHome.pager.lastPage}"/>
               <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/>
           </s:link>
  -        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                           rendered="#{!directoryHome.pager.nextPageAvailable}"/>
   
       </h:panelGrid>
  @@ -289,7 +291,7 @@
                   <h:outputText value="-" rendered="#{node.isInstance('WikiDirectory')}"/>
               </s:fragment>
               <s:fragment rendered="#{clipboard.isCut(node.id)}">
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.cut.gif" width="18" height="20"/>
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.cut.gif" width="18" height="20"/>
               </s:fragment>
           </h:column>
           <h:column>
  @@ -297,23 +299,23 @@
                   <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" accesskey="."
                           rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}">
                       <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/>
                   </s:link>
               </f:facet>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif"
                               width="18" height="20"
                               rendered="#{node.isInstance('WikiDirectory')}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif"
                               width="18" height="20"
                               rendered="#{node.isInstance('WikiDocument') and node.id != directoryHome.instance.defaultFile.id}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.default.gif"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.default.gif"
                               width="18" height="20"
                               rendered="#{node.isInstance('WikiDocument') and node.id == directoryHome.instance.defaultFile.id}"/>
   
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[node.contentType].displayIcon}"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[node.contentType].displayIcon}"
                               width="18" height="20"
                               rendered="#{node.isInstance('WikiUpload') and !empty uploadTypes[node.contentType]}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}"
                               width="18" height="20"
                               rendered="#{node.isInstance('WikiUpload') and empty uploadTypes[node.contentType]}"/>
           </h:column>
  @@ -374,12 +376,13 @@
               <f:facet name="header">
                   #{messages['lacewiki.label.dirDisplay.Owner']}
               </f:facet>
  -            <s:span styleClass="undecoratedLink">
  +            <s:span styleClass="undecoratedLink" rendered="#{node.ownedByRegularUser}">
                   <s:link view="/userInfo_#{skin}.xhtml" propagation="none">
                       <f:param name="userId" value="#{node.createdBy.id}"/>
                       <h:outputText value="#{node.createdBy.fullname}"/>
                   </s:link>
               </s:span>
  +            <h:outputText rendered="#{not node.ownedByRegularUser}" value="#{node.createdBy.fullname}"/>
           </h:column>
   
           <h:column>
  @@ -401,7 +404,7 @@
                   #{messages['lacewiki.label.dirDisplay.LastModifiedOn']}
               </f:facet>
               <h:outputText value="#{node.lastModifiedOn}">
  -                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
               </h:outputText>
               (<s:span styleClass="undecoratedLink">
                   <s:link view="/userInfo_#{skin}.xhtml" propagation="none">
  
  
  
  1.4       +7 -7      jboss-seam/examples/wiki/view/tagDisplay_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: tagDisplay_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/tagDisplay_d.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- tagDisplay_d.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ tagDisplay_d.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -5,7 +5,7 @@
                   xmlns:ui="http://java.sun.com/jsf/facelets"
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:param name="hideControls" value="true"/>
   
  @@ -33,13 +33,13 @@
                   <h:outputText value="#{messages['lacewiki.label.tagDisplay.Tag']}: #{tagQuery.tag}"/>
               </f:facet>
   
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif"
                               width="18" height="20" style="vertical-align:middle;margin-right: 5px;"
                               rendered="#{file.isInstance('WikiDocument')}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[file.contentType].displayIcon}"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[file.contentType].displayIcon}"
                               width="18" height="20" style="vertical-align:middle;margin-right: 5px;"
                               rendered="#{file.isInstance('WikiUpload') and !empty uploadTypes[file.contentType]}"/>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}"
                               width="18" height="20" style="vertical-align:middle;margin-right: 5px;"
                               rendered="#{file.isInstance('WikiUpload') and empty uploadTypes[file.contentType]}"/>
   
  @@ -69,7 +69,7 @@
               <f:facet name="header">
                   <h:outputText value="#{messages['lacewiki.label.tagDisplay.InDirectory']}"/>
               </f:facet>
  -            <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
  +            <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif"
                               width="18" height="20" style="vertical-align: middle; margin-right: 5px;"/>
               <s:link value="#{wiki:truncateString(file.parent.name, 20, '...')}"
                       view="/dirDisplay_#{skin}.xhtml"
  @@ -95,7 +95,7 @@
                   <h:outputText value="#{messages['lacewiki.label.tagDisplay.CreatedOn']}"/>
               </f:facet>
               <h:outputText value="#{file.createdOn}">
  -                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
               </h:outputText>
           </h:column>
           <h:column rendered="#{!empty file.lastModifiedOn and !empty file.lastModifiedBy}">
  @@ -103,7 +103,7 @@
                   <h:outputText value="#{messages['lacewiki.label.tagDisplay.LastModifiedOn']}"/>
               </f:facet>
               <h:outputText value="#{file.lastModifiedOn}">
  -                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
               </h:outputText>
               (<s:span styleClass="undecoratedLink">
                   <s:link view="/userInfo_#{skin}.xhtml" propagation="none">
  
  
  
  1.4       +1 -1      jboss-seam/examples/wiki/view/dirEdit_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirEdit_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit_m.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- dirEdit_m.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ dirEdit_m.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.dirEdit.CreateDirectory']}" rendered="#{!directoryHome.managed}"/>
  
  
  
  1.5       +3 -2      jboss-seam/examples/wiki/view/userHome_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userHome_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome_d.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- userHome_d.xhtml	19 Dec 2007 04:29:18 -0000	1.4
  +++ userHome_d.xhtml	30 Dec 2007 02:33:19 -0000	1.5
  @@ -8,7 +8,7 @@
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userHome.MemberAccount']} '#{userHome.instance.username}'"/>
  @@ -294,7 +294,8 @@
               <div class="formFields">
                   <ui:include src="includes/preferencesEditor.xhtml">
                       <ui:param name="tabId" value="userPrefsTab"/>
  -                    <ui:param name="preferenceComponents" value="#{userPreferenceComponents}"/>
  +                    <ui:param name="statusId" value="userHomeFormStatus"/>
  +                    <ui:param name="preferenceEntities" value="#{userPreferenceEntities}"/>
                   </ui:include>
               </div>
           </div>
  
  
  
  1.6       +4 -4      jboss-seam/examples/wiki/view/docHistory_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docHistory_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory_d.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- docHistory_d.xhtml	19 Dec 2007 04:29:18 -0000	1.5
  +++ docHistory_d.xhtml	30 Dec 2007 02:33:19 -0000	1.6
  @@ -7,7 +7,7 @@
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.docHistory.DocumentHistory']} #{documentHistory.currentFile.name}"/>
  @@ -55,7 +55,7 @@
               <div class="label">#{messages['lacewiki.label.docHistory.CreatedOn']}:</div>
               <div class="output">
                   <h:outputText value="#{documentHistory.currentFile.createdOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
                   (#{documentHistory.currentFile.createdBy.username})
               </div>
  @@ -65,7 +65,7 @@
               <div class="label">#{messages['lacewiki.label.docHistory.LastModifiedOn']}:</div>
               <div class="output">
                   <h:outputText value="#{documentHistory.currentFile.lastModifiedOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
                   (#{documentHistory.currentFile.lastModifiedBy.username})
               </div>
  @@ -91,7 +91,7 @@
                       <h:column>
                           <s:fragment rendered="#{not empty hfile.lastModifiedOn}">
                               <h:outputText value="#{hfile.lastModifiedOn}">
  -                                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                               </h:outputText>
                               <h:outputText value="&#160;(#{hfile.lastModifiedByUsername})" rendered="#{!empty hfile.lastModifiedByUsername}"/>
                           </s:fragment>
  
  
  
  1.3       +1 -1      jboss-seam/examples/wiki/view/adminHome_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: adminHome_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome_m.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- adminHome_m.xhtml	12 Oct 2007 16:31:24 -0000	1.2
  +++ adminHome_m.xhtml	30 Dec 2007 02:33:19 -0000	1.3
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.adminHome.Administration']}"/>
  
  
  
  1.2       +3 -3      jboss-seam/examples/wiki/view/userInfo_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userInfo_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userInfo_d.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- userInfo_d.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ userInfo_d.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -8,7 +8,7 @@
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:param name="hideControls" value="#{not s:hasPermission('User', 'isAdmin', currentUser)}"/>
   
  @@ -47,7 +47,7 @@
                           </s:div>
                           <s:div styleClass="output">
                               <h:outputText value="#{userHome.instance.createdOn}">
  -                                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                               </h:outputText>
                               <h:outputText value="&#160;(#{messages['lacewiki.label.userInfo.NotActivated']})"
                                             rendered="#{not userHome.instance.admin and not userHome.instance.guest
  @@ -61,7 +61,7 @@
                           </s:div>
                           <s:div styleClass="output">
                               <h:outputText value="#{userHome.instance.lastLoginOn}">
  -                                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                               </h:outputText>
                           </s:div>
                       </s:div>
  
  
  
  1.10      +9 -10     jboss-seam/examples/wiki/view/docDisplay_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docDisplay_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_d.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- docDisplay_d.xhtml	19 Dec 2007 04:29:18 -0000	1.9
  +++ docDisplay_d.xhtml	30 Dec 2007 02:33:19 -0000	1.10
  @@ -8,8 +8,7 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:c="http://java.sun.com/jstl/core"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -                xmlns:rich="http://richfaces.org/rich"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="includeHeaders">
   
  @@ -118,7 +117,7 @@
   
           </s:div>
   
  -        <s:div rendered="#{wikiPreferences.showTags and not documentHome.instance.macroPresent('hideTags') and not empty documentHome.instance.tags}"
  +        <s:div rendered="#{preferences.get('Wiki').showTags and not documentHome.instance.macroPresent('hideTags') and not empty documentHome.instance.tags}"
                  styleClass="documentTags undecoratedLink smallFont">
               <s:div>
                   #{messages['lacewiki.label.docDisplay.Tags']}:&#160;
  @@ -133,14 +132,14 @@
               </s:div>
           </s:div>
   
  -        <s:div rendered="#{wikiPreferences.showDocumentCreatorHistory and not documentHome.instance.macroPresent('hideCreatorHistory')}"
  +        <s:div rendered="#{preferences.get('Wiki').showDocumentCreatorHistory and not documentHome.instance.macroPresent('hideCreatorHistory')}"
                  styleClass="documentCreatorHistory undecoratedLink smallFont">
               <s:div>
                   #{messages['lacewiki.label.docDisplay.Created']}:&#160;
                   <h:outputText value="#{documentHome.instance.createdOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
  -                <h:outputText value="&#160;#{wikiPreferences.timeZone}&#160;("/>
  +                <h:outputText value="&#160;#{preferences.get('Wiki').timeZone}&#160;("/>
                   <h:outputLink value="#{wiki:renderURL(documentHome.instance.createdBy.memberHome)}"
                                 rendered="#{!empty documentHome.instance.createdBy.memberHome}">
                       <h:outputText value="#{documentHome.instance.createdBy.fullname}"/>
  @@ -152,9 +151,9 @@
               <s:div rendered="#{not empty documentHome.instance.lastModifiedBy}">
                   #{messages['lacewiki.label.docDisplay.LastModified']}:&#160;
                   <h:outputText value="#{documentHome.instance.lastModifiedOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
  -                <h:outputText value="&#160;#{wikiPreferences.timeZone}&#160;("/>
  +                <h:outputText value="&#160;#{preferences.get('Wiki').timeZone}&#160;("/>
                   <h:outputLink value="#{wiki:renderURL(documentHome.instance.lastModifiedBy.memberHome)}"
                                 rendered="#{!empty documentHome.instance.lastModifiedBy.memberHome}">
                       <h:outputText value="#{documentHome.instance.lastModifiedBy.fullname}"/>
  @@ -170,9 +169,9 @@
   
                       <s:fragment rendered="#{not empty hfile.lastModifiedOn}">
                           <h:outputText value="#{hfile.lastModifiedOn}">
  -                            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                           </h:outputText>
  -                        <h:outputText value="&#160;#{wikiPreferences.timeZone}&#160;(#{hfile.lastModifiedByUsername})"/>
  +                        <h:outputText value="&#160;#{preferences.get('Wiki').timeZone}&#160;(#{hfile.lastModifiedByUsername})"/>
                       </s:fragment>
                       <s:fragment rendered="#{empty hfile.lastModifiedOn}">
                           <h:outputText value="(Initial Revision)"/>
  
  
  
  1.2       +2 -2      jboss-seam/examples/wiki/view/testtemplate.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: testtemplate.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/testtemplate.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- testtemplate.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ testtemplate.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -9,9 +9,9 @@
   
   <head><title>Test</title>
   
  -    <script type="text/javascript" src="#{wikiPreferences.baseUrl}/seam/resource/remoting/resource/remote.js"></script>
  +    <script type="text/javascript" src="#{preferences.get('Wiki').baseUrl}/seam/resource/remoting/resource/remote.js"></script>
   
  -    <script type="text/javascript" src="#{wikiPreferences.baseUrl}/seam/resource/remoting/interface.js?httpSessionChecker"></script>
  +    <script type="text/javascript" src="#{preferences.get('Wiki').baseUrl}/seam/resource/remoting/interface.js?httpSessionChecker"></script>
   
       <script type="text/javascript">
           Seam.Remoting.displayLoadingMessage = function() {};
  
  
  
  1.4       +1 -1      jboss-seam/examples/wiki/view/docEdit_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docEdit_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit_m.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- docEdit_m.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ docEdit_m.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.docEdit.CreateDocument']}" rendered="#{!documentHome.managed}"/>
  
  
  
  1.3       +1 -1      jboss-seam/examples/wiki/view/userRegister_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userRegister_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister_m.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- userRegister_m.xhtml	12 Oct 2007 16:31:24 -0000	1.2
  +++ userRegister_m.xhtml	30 Dec 2007 02:33:19 -0000	1.3
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userRegister.Registration']}"/>
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/view/uploadEdit_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: uploadEdit_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/uploadEdit_m.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- uploadEdit_m.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ uploadEdit_m.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.uploadEdit.UploadFile']}" rendered="#{!uploadHome.managed}"/>
  
  
  
  1.3       +1 -1      jboss-seam/examples/wiki/view/tagDisplay_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: tagDisplay_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/tagDisplay_m.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- tagDisplay_m.xhtml	12 Oct 2007 16:31:24 -0000	1.2
  +++ tagDisplay_m.xhtml	30 Dec 2007 02:33:19 -0000	1.3
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.tagDisplay.Tag']}"/>
  
  
  
  1.6       +3 -2      jboss-seam/examples/wiki/view/adminHome_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: adminHome_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome_d.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- adminHome_d.xhtml	19 Dec 2007 04:29:18 -0000	1.5
  +++ adminHome_d.xhtml	30 Dec 2007 02:33:19 -0000	1.6
  @@ -8,7 +8,7 @@
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.adminHome.Administration']}"/>
  @@ -230,7 +230,8 @@
               <div class="formFields">
                   <ui:include src="includes/preferencesEditor.xhtml">
                       <ui:param name="tabId" value="systemPrefsTab"/>
  -                    <ui:param name="preferenceComponents" value="#{systemPreferenceComponents}"/>
  +                    <ui:param name="statusId" value="adminFormStatus"/>
  +                    <ui:param name="preferenceEntities" value="#{systemPreferenceEntities}"/>
                   </ui:include>
               </div>
           </div>
  
  
  
  1.2       +2 -2      jboss-seam/examples/wiki/view/uploadEdit_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: uploadEdit_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/uploadEdit_d.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- uploadEdit_d.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ uploadEdit_d.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -8,7 +8,7 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.uploadEdit.UploadFile']}" rendered="#{!uploadHome.managed}"/>
  @@ -59,7 +59,7 @@
                       <div class="label">#{messages['lacewiki.label.uploadEdit.CreatedOn']}:</div>
                       <div class="output">
                           <h:outputText value="#{uploadHome.instance.createdOn}">
  -                            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                           </h:outputText>
                           <s:span id="ownerDisplay">&#160;(#{uploadHome.instance.createdBy.username})</s:span>
                           <h:outputLink id="selectOwner" value="#" tabindex="1" styleClass="buttonNonpersistent sessionEventTrigger"
  
  
  
  1.6       +23 -23    jboss-seam/examples/wiki/view/userList_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userList_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList_d.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- userList_d.xhtml	19 Dec 2007 13:33:35 -0000	1.5
  +++ userList_d.xhtml	30 Dec 2007 02:33:19 -0000	1.6
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userList.MemberList']}"/>
  @@ -98,29 +98,29 @@
                            rendered="#{userSearch.rowCount > 0}">
   
                   <h:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="1">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!userSearch.previousPageAvailable}"/>
   
                   <h:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="1">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!userSearch.previousPageAvailable}"/>
   
                   <h:outputText value="#{messages['lacewiki.label.userList.Found']} #{userSearch.rowCount} #{messages['lacewiki.label.userList.Members']}"/>
   
                   <h:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="1">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!userSearch.nextPageAvailable}"/>
   
                   <h:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="1">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/>
                   </h:commandLink>
  -                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
  +                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
                                   rendered="#{!userSearch.nextPageAvailable}"/>
   
               </h:panelGrid>
  @@ -144,9 +144,9 @@
               <h:column>
                   <f:facet name="header">
                       <h:commandLink action="#{userSearch.sortBy('username')}" tabindex="1">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
                                           rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
                                           rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
                           <h:outputText value="#{messages['lacewiki.label.userList.Username']}"/>
                       </h:commandLink>
  @@ -166,9 +166,9 @@
               <h:column>
                   <f:facet name="header">
                       <h:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="1">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
                                           rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
                                           rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
                           <h:outputText value="#{messages['lacewiki.label.userList.FirstName']}"/>
                       </h:commandLink>
  @@ -179,9 +179,9 @@
               <h:column>
                   <f:facet name="header">
                       <h:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="1">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
                                           rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
                                           rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
                           <h:outputText value="#{messages['lacewiki.label.userList.LastName']}"/>
                       </h:commandLink>
  @@ -192,9 +192,9 @@
               <h:column rendered="#{wiki:showEmailAddress()}">
                   <f:facet name="header">
                       <h:commandLink action="#{userSearch.sortBy('email')}" tabindex="1">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
                                           rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
                                           rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
                           <h:outputText value="#{messages['lacewiki.label.userList.Email']}"/>
                       </h:commandLink>
  @@ -205,30 +205,30 @@
               <h:column>
                   <f:facet name="header">
                       <h:commandLink action="#{userSearch.sortBy('createdOn')}" tabindex="1">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
                                           rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/>
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
                                           rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/>
                           <h:outputText value="#{messages['lacewiki.label.userList.JoinedOn']}"/>
                       </h:commandLink>
                   </f:facet>
                   <h:outputText value="#{u.createdOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
               </h:column>
   
               <h:column>
                   <f:facet name="header">
                       <h:commandLink action="#{userSearch.sortBy('lastLoginOn')}" tabindex="1">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
                                           rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastLoginOn'}"/>
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
                                           rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastLoginOn'}"/>
                           <h:outputText value="#{messages['lacewiki.label.userList.LastLoginOn']}"/>
                       </h:commandLink>
                   </f:facet>
                   <h:outputText value="#{u.lastLoginOn}" rendered="#{not empty u.lastLoginOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
                   <h:outputText value="-" rendered="#{empty u.lastLoginOn}"/>
               </h:column>
  
  
  
  1.5       +5 -5      jboss-seam/examples/wiki/view/dirEdit_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirEdit_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit_d.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- dirEdit_d.xhtml	19 Dec 2007 04:29:18 -0000	1.4
  +++ dirEdit_d.xhtml	30 Dec 2007 02:33:19 -0000	1.5
  @@ -8,7 +8,7 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.dirEdit.CreateDirectory']}" rendered="#{!directoryHome.managed}"/>
  @@ -70,7 +70,7 @@
               </div>
               <div class="output">
                   <h:outputText value="#{directoryHome.instance.createdOn}">
  -                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                   </h:outputText>
                   <s:span id="ownerDisplay">&#160;(#{directoryHome.instance.createdBy.username})</s:span>
                   <h:outputLink id="selectOwner" value="#" tabindex="1" styleClass="buttonNonpersistent sessionEventTrigger"
  @@ -152,7 +152,7 @@
   
                           <h:column>
                               <a:outputPanel>
  -                                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif" width="18" height="20"/>
  +                                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif" width="18" height="20"/>
                               </a:outputPanel>
                           </h:column>
   
  @@ -179,7 +179,7 @@
                                              oncomplete="onAjaxRequestComplete()"
                                              styleClass="sessionEventTrigger" tabindex="1"
                                              reRender="menuEditor">
  -                                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/up.gif" width="18" height="18"/>
  +                                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/up.gif" width="18" height="18"/>
                               </a:commandLink>
                           </h:column>
                           <h:column>
  @@ -189,7 +189,7 @@
                                              oncomplete="onAjaxRequestComplete()"
                                              styleClass="sessionEventTrigger" tabindex="1"
                                              reRender="menuEditor">
  -                                <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/down.gif" width="18" height="18"/>
  +                                <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/down.gif" width="18" height="18"/>
                               </a:commandLink>
                           </h:column>
   
  
  
  
  1.8       +5 -5      jboss-seam/examples/wiki/view/docDisplay_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docDisplay_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_m.xhtml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- docDisplay_m.xhtml	19 Dec 2007 13:33:35 -0000	1.7
  +++ docDisplay_m.xhtml	30 Dec 2007 02:33:19 -0000	1.8
  @@ -7,7 +7,7 @@
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:c="http://java.sun.com/jstl/core"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">#{documentHome.instance.name}</ui:define>
   
  @@ -152,9 +152,9 @@
                   <h:panelGrid columns="3">
                       <s:span><a name="attachment#{uiComponent['attachmentTable'].rowIndex + 1}"/></s:span>
                       <h:outputText value="#&#160;#{uiComponent['attachmentTable'].rowIndex + 1}"/>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}"
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}"
                                       rendered="#{not empty uploadTypes[link.file.contentType]}" width="18" height="20"/>
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}"
                                       rendered="#{empty uploadTypes[link.file.contentType]}" width="18" height="20"/>
                   </h:panelGrid>
               </h:column>
  @@ -171,7 +171,7 @@
   
       </s:div>
   
  -    <s:div rendered="#{wikiPreferences.showTags and not documentHome.instance.macroPresent('hideTags') and not empty documentHome.instance.tags}"
  +    <s:div rendered="#{preferences.get('Wiki').showTags and not documentHome.instance.macroPresent('hideTags') and not empty documentHome.instance.tags}"
              styleClass="smallFont">
           <s:div>
               #{messages['lacewiki.label.docDisplay.Tags']}:&#160;
  @@ -222,7 +222,7 @@
   
                               <s:div styleClass="smallFont">
                                   <h:outputText value="#{c.createdOn}">
  -                                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                                   </h:outputText>
   
                                   <s:div rendered="#{c.ownedByRegularUser}">
  
  
  
  1.11      +4 -4      jboss-seam/examples/wiki/view/docEdit_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docEdit_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit_d.xhtml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- docEdit_d.xhtml	19 Dec 2007 04:29:18 -0000	1.10
  +++ docEdit_d.xhtml	30 Dec 2007 02:33:19 -0000	1.11
  @@ -8,7 +8,7 @@
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.docEdit.CreateDocument']}" rendered="#{!documentHome.managed}"/>
  @@ -161,8 +161,8 @@
                                   <ui:param name="namingContainer" value="docEditForm"/>
                                   <ui:param name="statusId" value="docEditFormStatus"/>
                                   <ui:param name="label" value="#{messages['lacewiki.label.docEdit.Content']}"/>
  -                                <ui:param name="textEditorColumns" value="#{docEditorPreferences.properties['regularEditAreaColumns']}"/>
  -                                <ui:param name="textEditorRows" value="#{docEditorPreferences.properties['regularEditAreaRows']}"/>
  +                                <ui:param name="textEditorColumns" value="#{preferences.get('DocEditor').regularEditAreaColumns}"/>
  +                                <ui:param name="textEditorRows" value="#{preferences.get('DocEditor').regularEditAreaRows}"/>
                                   <ui:param name="valueBinding" value="#{documentHome.formContent}"/>
                                   <ui:param name="valueMaxLength" value="32768"/>
                                   <ui:param name="valueRequired" value="true"/>
  @@ -210,7 +210,7 @@
                                   </div>
                                   <div class="output">
                                       <h:outputText value="#{documentHome.instance.createdOn}">
  -                                        <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                                        <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
                                       </h:outputText>
                                       <s:span id="ownerDisplay">&#160;(#{documentHome.instance.createdBy.username})</s:span>
                                       <h:outputLink id="selectOwner" value="#" tabindex="1" styleClass="buttonNonpersistent"
  
  
  
  1.3       +2 -2      jboss-seam/examples/wiki/view/search_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: search_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search_m.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- search_m.xhtml	12 Oct 2007 16:31:24 -0000	1.2
  +++ search_m.xhtml	30 Dec 2007 02:33:19 -0000	1.3
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.search.Search']}: #{wikiSearch.simpleQuery}"/>
  @@ -62,7 +62,7 @@
   
               <h:column>
                   <h:panelGrid columns="2">
  -                    <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{hit.icon}" width="18" height="20"/>
  +                    <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{hit.icon}" width="18" height="20"/>
                       <h:outputLink value="#{hit.link}" tabindex="1"><h:outputText escape="false" value="#{hit.title}"/></h:outputLink>
                   </h:panelGrid>
                   <h:outputText escape="false" value="#{hit.fragment}"/>
  
  
  
  1.4       +4 -4      jboss-seam/examples/wiki/view/docHistory_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docHistory_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory_m.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- docHistory_m.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ docHistory_m.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.docHistory.DocumentHistory']} #{documentHistory.currentFile.name}"/>
  @@ -27,13 +27,13 @@
       <div>#{messages['lacewiki.label.docHistory.Parent']}:&#160;<h:outputText value="#{documentHistory.currentFile.parent.name}"/></div>
       <div>#{messages['lacewiki.label.docHistory.CreatedOn']}:&#160;
           <h:outputText value="#{documentHistory.currentFile.createdOn}">
  -            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
           </h:outputText>
           (#{documentHistory.currentFile.createdBy.username})
       </div>
       <div>#{messages['lacewiki.label.docHistory.LastModifiedOn']}:&#160;
           <h:outputText value="#{documentHistory.currentFile.lastModifiedOn}">
  -            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +            <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
           </h:outputText>
           (#{documentHistory.currentFile.lastModifiedBy.username})
       </div>
  @@ -50,7 +50,7 @@
   
           <h:column>
               <h:outputText value="#{hnode.lastModifiedOn}">
  -                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
               </h:outputText>
               <h:outputText value="&#160;(#{hnode.lastModifiedByUsername})" rendered="#{!empty hnode.lastModifiedByUsername}"/>
               <h:outputText value="&#160;(unknown)" rendered="#{empty hnode.lastModifiedByUsername}"/>
  
  
  
  1.4       +1 -1      jboss-seam/examples/wiki/view/userRegister_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userRegister_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister_d.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- userRegister_d.xhtml	19 Dec 2007 04:29:18 -0000	1.3
  +++ userRegister_d.xhtml	30 Dec 2007 02:33:19 -0000	1.4
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -                template="themes/#{wikiPreferences.themeName}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userRegister.Registration']}"/>
  
  
  
  1.3       +1 -1      jboss-seam/examples/wiki/view/userList_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userList_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList_m.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- userList_m.xhtml	12 Oct 2007 16:31:24 -0000	1.2
  +++ userList_m.xhtml	30 Dec 2007 02:33:19 -0000	1.3
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userList.MemberList']}"/>
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/view/uploadCreate_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: uploadCreate_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/uploadCreate_m.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- uploadCreate_m.xhtml	19 Dec 2007 04:29:18 -0000	1.1
  +++ uploadCreate_m.xhtml	30 Dec 2007 02:33:19 -0000	1.2
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.upload.UploadFile']}"/>
  
  
  
  1.3       +1 -1      jboss-seam/examples/wiki/view/userHome_m.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userHome_m.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome_m.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- userHome_m.xhtml	12 Oct 2007 16:31:24 -0000	1.2
  +++ userHome_m.xhtml	30 Dec 2007 02:33:19 -0000	1.3
  @@ -6,7 +6,7 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
  -                template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
  +                template="themes/#{preferences.get('Wiki').themeName}/#{skin}/template.xhtml">
   
   <ui:define name="screenname">
       <h:outputText value="#{messages['lacewiki.label.userHome.MemberAccount']}"/>
  
  
  



More information about the jboss-cvs-commits mailing list