[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences preferences.jsp.vsl

[Walter M. <wal...@us...>]

  User: walterim
  Date: 06/12/12 10:46:32

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences
                        preferences.xhtml.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
                        view.xhtml.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences
                        preferences.jsp.vsl
  Log:
  Skin names/values corrected in preferences page
  
  Revision  Changes    Path
  1.3       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl
  
  Index: preferences.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- preferences.xhtml.vsl	11 Dec 2006 13:44:00 -0000	1.2
  +++ preferences.xhtml.vsl	12 Dec 2006 18:46:32 -0000	1.3
  @@ -20,9 +20,9 @@
                       <f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
                   </tr:selectOneChoice>
                   <tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
  -                    <f:selectItem itemLabel="Simple" itemValue="simple"/>
  -                    <f:selectItem itemLabel="Minimal" itemValue="minimal"/>
                       <f:selectItem itemLabel="Default" itemValue="default"/>
  +                    <f:selectItem itemLabel="Beach" itemValue="beach"/>
  +                    <f:selectItem itemLabel="Purple" itemValue="purple"/>
                   </tr:selectOneChoice>
                   <tr:inputText id="maxTableRows" value="#{${preferencesBeanName}.maxTableRows}" label="#{messages['preferences.max.table.rows']}:" columns="1">
                       <f:validateLongRange minimum="5" maximum="100"/>  
  
  
  
  1.2       +3 -3      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
  
  Index: view.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- view.xhtml.vsl	11 Dec 2006 13:43:58 -0000	1.1
  +++ view.xhtml.vsl	12 Dec 2006 18:46:32 -0000	1.2
  @@ -129,13 +129,13 @@
               </f:facet>
               <h:panelGroup>
   				<tr:commandLink action="#{${manageable.controllerBeanName}.load}" >
  -				   <t:graphicImage url="/images/load.gif" title="#{messages['action.load']}" border="0"/>
  +				   <t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/tableLoad.gif" title="#{messages['action.load']}" border="0"/>
   						<f:param name="${manageable.manageableIdentifier.name}" value="#{row.${manageable.manageableIdentifier.name}}" />
   				</tr:commandLink>
   #if ($manageable.delete)
   				<tr:spacer width="10" height="1"/>
   				<tr:commandLink action="#{${manageable.controllerBeanName}.delete}">
  -				   <t:graphicImage url="/images/delete.gif" title="#{messages['action.delete']}" border="0"/>
  +				   <t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/tableDelete.gif" title="#{messages['action.delete']}" border="0"/>
   						<f:param name="${manageable.manageableIdentifier.name}" value="#{row.${manageable.manageableIdentifier.name}}" />
   				</tr:commandLink>
   #end				
  @@ -166,7 +166,7 @@
       <c:if test="#{${formName}.editState}">
   	<tr:subform>
   		<tr:commandLink action="#{${manageable.controllerBeanName}.back}" accessKey="#{messages['action.back.access.key']}">
  -			<t:graphicImage url="/images/back.gif" title="#{messages['action.back']}" border="0" />
  +			<t:graphicImage url="/skins/#{${preferencesBeanName}.skin}/images/back.gif" title="#{messages['action.back']}" border="0" />
   		</tr:commandLink>
   	</tr:subform>
   	<tr:subform id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end enctype="multipart/form-data">
  
  
  
  1.2       +3 -3      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl
  
  Index: preferences.jsp.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- preferences.jsp.vsl	5 Dec 2006 19:39:33 -0000	1.1
  +++ preferences.jsp.vsl	12 Dec 2006 18:46:32 -0000	1.2
  @@ -45,9 +45,9 @@
                               <f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
                           </tr:selectOneChoice>
                           <tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
  -                            <f:selectItem itemLabel="Simple" itemValue="simple"/>
  -                            <f:selectItem itemLabel="Minimal" itemValue="minimal"/>
                               <f:selectItem itemLabel="Default" itemValue="default"/>
  +                    		<f:selectItem itemLabel="Beach" itemValue="beach"/>
  +                    		<f:selectItem itemLabel="Purple" itemValue="purple"/>
                           </tr:selectOneChoice>
                           <tr:inputText id="maxTableRows" value="#{${preferencesBeanName}.maxTableRows}" label="#{messages['preferences.max.table.rows']}:" columns="1">
                               <f:validateLongRange minimum="5" maximum="100"/>