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

[Christian Bauer]

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

  Modified:    examples/wiki/view/themes/default  template.xhtml
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.41      +5 -5      jboss-seam/examples/wiki/view/themes/default/template.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: template.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/themes/default/template.xhtml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- template.xhtml	20 Dec 2007 12:23:06 -0000	1.40
  +++ template.xhtml	30 Dec 2007 02:33:25 -0000	1.41
  @@ -26,8 +26,8 @@
       <script type="text/javascript" src="#{themePath}/js/jqHistoryRemote.js"></script>
       <script type="text/javascript" src="#{themePath}/js/jqProgressBar.js"></script>
       <script type="text/javascript" src="#{themePath}/js/jqDimensions.js"></script>
  -    <script type="text/javascript" src="#{wikiPreferences.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/resource/remote.js"></script>
  +    <script type="text/javascript" src="#{preferences.get('Wiki').baseUrl}/seam/resource/remoting/interface.js?httpSessionChecker"></script>
   
       <script type="text/javascript">
   
  @@ -314,7 +314,7 @@
               <ui:define name="mainMenuFooter">
                   <s:div styleClass="feeds">
                       <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{wikiRoot.feed.id}">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.atom.gif" width="18" height="18"/>
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/>
                           <span class="feedText">#{messages['lacewiki.button.SiteFeed']}</span>
                       </h:outputLink>
                   </s:div>
  @@ -339,14 +339,14 @@
               <div id="messageBox" class="messageBox">
                   <ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}">
                       <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/info.gif"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif"
                                           width="18" height="18"
                                           styleClass="infoImage"/>
                           <h:outputText styleClass="infoMessage" value="#{message.summary}"/>
                       </h:panelGrid>
                       <!-- TODO: Well, how do we do that in EL without static stuff?! #{message.severity == 'Warn' or message.severity == 'Error'}
                       <h:panelGrid columns="2" rendered="false">
  -                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
  +                        <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif"
                                           width="18" height="18"
                                           styleClass="attentionImage"/>
                           <h:outputText styleClass="attentionMessage" value="#{message.summary}"/>