UI tweaks
This commit is contained in:
		
							parent
							
								
									94c64b6bde
								
							
						
					
					
						commit
						5ef369743a
					
				|  | @ -1,8 +1,8 @@ | |||
| 
 | ||||
| joinfaces.jsf.project-stage=development | ||||
| joinfaces.primefaces.theme=omega | ||||
| joinfaces.primefaces.theme=bluesky | ||||
| 
 | ||||
| spring.thymeleaf.enabled=false | ||||
| #spring.thymeleaf.enabled=false | ||||
| 
 | ||||
| spring.datasource.url=jdbc:sqlite:/home/timh/foo/bazz/recipes.db | ||||
| #spring.datasource.username=dbuser | ||||
|  | @ -10,4 +10,4 @@ spring.datasource.url=jdbc:sqlite:/home/timh/foo/bazz/recipes.db | |||
| spring.datasource.driverClassName=org.sqlite.JDBC | ||||
| #spring.jpa.hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect | ||||
| spring.jpa.database-platform=org.sqlite.hibernate.dialect.SQLiteDialect | ||||
| #spring.jpa.show-sql: true | ||||
| #spring.jpa.show-sql: true | ||||
|  |  | |||
|  | @ -1,7 +1,3 @@ | |||
| server: | ||||
|   context-path: /codenotfound | ||||
|   port: 9090 | ||||
| 
 | ||||
| spring: | ||||
|   datasource: | ||||
|     url:  jdbc:sqlite:/home/timh/foo/bazz/recipes.db | ||||
|  |  | |||
|  | @ -38,7 +38,7 @@ | |||
|                             <p:outputLabel for="@next" | ||||
|                                 value="Title" | ||||
|                             /> | ||||
|                             <p:inputText id="rtitle" size="30" | ||||
|                             <p:inputText id="rtitle" size="45" | ||||
|                                 required="true" focus="true" | ||||
|                                 value="#{recipeDetailBean.recipe.title}" | ||||
|                             > | ||||
|  | @ -84,13 +84,13 @@ | |||
|                             <p:outputLabel for="@next" | ||||
|                                 value="Source" | ||||
|                             /> | ||||
|                             <p:inputText id="rsource" size="30" | ||||
|                             <p:inputText id="rsource" size="45" | ||||
|                                 value="#{recipeDetailBean.recipe.source}" | ||||
|                             /> | ||||
|                             <p:outputLabel for="@next" | ||||
|                                 value="URL" | ||||
|                             /> | ||||
|                             <p:inputText id="rurl" size="30" | ||||
|                             <p:inputText id="rurl" size="45" | ||||
|                                 value="#{recipeDetailBean.recipe.link}" | ||||
|                             /> | ||||
|                             <p:outputLabel for="@next" | ||||
|  | @ -198,16 +198,17 @@ | |||
|                                         </p:selectBooleanCheckbox> | ||||
|                                     </p:column> | ||||
|                                     <p:column label="Amt" | ||||
|                                         style="width: 4em; text-align: right" | ||||
|                                         style="width: 4em" | ||||
|                                     > | ||||
|                                         <p:inputText id="ingAmt" size="5" | ||||
|                                             value="#{item.displayAmount}" | ||||
|                                             style="text-align: right" | ||||
|                                             rendered="#{not item.ingGroup}" | ||||
|                                         > | ||||
|                                         </p:inputText> | ||||
|                                     </p:column> | ||||
|                                     <p:column label="Units" | ||||
|                                         style="width: 6em" | ||||
|                                         style="width: 7em" | ||||
|                                     > | ||||
|                                         <p:inputText id="ingUnit" | ||||
|                                             value="#{item.unit}" size="10" | ||||
|  | @ -216,7 +217,7 @@ | |||
|                                         </p:inputText> | ||||
|                                     </p:column> | ||||
|                                     <p:column label="Item" style="width: 22em"> | ||||
|                                         <p:inputText id="ingItem" size="20" | ||||
|                                         <p:inputText id="ingItem" size="35" | ||||
|                                             value="#{item.item}" | ||||
|                                         > | ||||
|                                         </p:inputText> | ||||
|  | @ -233,7 +234,7 @@ | |||
|                                     </p:column> | ||||
|                                     <p:column label="Key"> | ||||
|                                         <p:inputText id="ingKey" | ||||
|                                             value="#{item.ingkey}" size="12" | ||||
|                                             value="#{item.ingkey}" size="20" | ||||
|                                             rendered="#{not item.ingGroup}" | ||||
|                                         /> | ||||
|                                     </p:column> | ||||
|  |  | |||
|  | @ -10,16 +10,19 @@ | |||
|         <h:form id="form1"> | ||||
|             <p:panelGrid label="Find a Recipe" columns="1"> | ||||
|                 <p:panelGrid columns="3"> | ||||
|                     <p:inputText id="searchFor" | ||||
|                         placeholder="Recipe title (todo) cuisine, etc." | ||||
|                         styleClass="redBox" accesskey="f" | ||||
|                         value="#{adminMainBean.searchText}" | ||||
|                     > | ||||
|                         <f:ajax event="change" execute="@this" | ||||
|                             render="@form" | ||||
|                             listener="#{adminMainBean.ajaxUpdateList}" | ||||
|                         /> | ||||
| C                   </p:inputText> | ||||
|                     <span class="ui-input-icon-left"> <i | ||||
|                         class="pi pi-search" | ||||
|                     /> <p:inputText id="searchFor" width="45" | ||||
|                             placeholder="Recipe title (todo) cuisine, etc." | ||||
|                             styleClass="redBox" accesskey="f" | ||||
|                             value="#{adminMainBean.searchText}" | ||||
|                         > | ||||
|                             <f:ajax event="change" | ||||
|                                 execute="@this" render="@form" | ||||
|                                 listener="#{adminMainBean.ajaxUpdateList}" | ||||
|                             /> | ||||
|                         </p:inputText> | ||||
|                     </span> | ||||
|                     <p:button id="find" value="Find" | ||||
|                         defaultCommand="true" | ||||
|                         action="#{adminMainBean.doFind}" | ||||
|  |  | |||
|  | @ -37,44 +37,54 @@ | |||
|                     </f:facet> | ||||
|                     <p:row> | ||||
|                         <p:column id="leftCol" style="width: 80%"> | ||||
|                             <img id="bigpix" | ||||
|                                 src="/img/picture/#{recipeDetailBean.recipe.id}" | ||||
|                             /> | ||||
|                             <p:panelGrid id="pnlDetails" columns="2"> | ||||
|                                 <p:commandButton value="<- Back" | ||||
|                                     styleClass="ui-button-arrow-left" | ||||
|                                     action="main.jsf" | ||||
|                                     immediate="true" | ||||
|                                 /> | ||||
|                                 <p:commandButton value="Print" | ||||
|                                     action="recipePrint.jsf" | ||||
|                                     styleClass="ui-button-print" | ||||
|                                     immediate="true" | ||||
|                                 /> | ||||
|                                 <p:outputLabel for="@next" | ||||
|                                     value="Categories:" | ||||
|                                 /> | ||||
|                                 <h:outputText label="Category: " | ||||
|                                     value="#{adminMainBean.formatCategories(recipeDetailBean.recipe)}" | ||||
|                                 /> | ||||
|                                 <p:outputLabel for="@next" | ||||
|                                     value="Cuisine:" | ||||
|                                 /> | ||||
|                                 <h:outputText label="Cuisine: " | ||||
|                                     value="#{recipeDetailBean.recipe.cuisine}" | ||||
|                                 /> | ||||
|                                 <p:outputLabel for="@next" | ||||
|                                     value="Prep Time:" | ||||
|                                 /> | ||||
|                                 <h:outputText label="Prep Time: " | ||||
|                                     value="#{userSession.formatTime(recipeDetailBean.recipe.preptime)}" | ||||
|                                 /> | ||||
|                                 <p:outputLabel for="@next" | ||||
|                                     value="Cook Time:" | ||||
|                                 /> | ||||
|                                 <h:outputText label="Cook Time: " | ||||
|                                     value="#{userSession.formatTime(recipeDetailBean.recipe.cooktime)}" | ||||
|                             <p:panelGrid columns="2"> | ||||
|                                 <img id="bigpix" | ||||
|                                     src="/img/picture/#{recipeDetailBean.recipe.id}" | ||||
|                                 /> | ||||
|                                 <p:panelGrid id="pnlDetails" | ||||
|                                     columns="2" | ||||
|                                 > | ||||
|                                     <p:commandButton | ||||
|                                         value="<- Back" | ||||
|                                         styleClass="ui-button-arrow-left" | ||||
|                                         action="main.jsf" | ||||
|                                         immediate="true" | ||||
|                                     /> | ||||
|                                     <p:commandButton | ||||
|                                         value="Print" | ||||
|                                         action="recipePrint.jsf" | ||||
|                                         styleClass="ui-button-print" | ||||
|                                         immediate="true" | ||||
|                                     /> | ||||
|                                     <p:outputLabel for="@next" | ||||
|                                         value="Categories:" | ||||
|                                     /> | ||||
|                                     <h:outputText | ||||
|                                         label="Category: " | ||||
|                                         value="#{adminMainBean.formatCategories(recipeDetailBean.recipe)}" | ||||
|                                     /> | ||||
|                                     <p:outputLabel for="@next" | ||||
|                                         value="Cuisine:" | ||||
|                                     /> | ||||
|                                     <h:outputText | ||||
|                                         label="Cuisine: " | ||||
|                                         value="#{recipeDetailBean.recipe.cuisine}" | ||||
|                                     /> | ||||
|                                     <p:outputLabel for="@next" | ||||
|                                         value="Prep Time:" | ||||
|                                     /> | ||||
|                                     <h:outputText | ||||
|                                         label="Prep Time: " | ||||
|                                         value="#{userSession.formatTime(recipeDetailBean.recipe.preptime)}" | ||||
|                                     /> | ||||
|                                     <p:outputLabel for="@next" | ||||
|                                         value="Cook Time:" | ||||
|                                     /> | ||||
|                                     <h:outputText | ||||
|                                         label="Cook Time: " | ||||
|                                         value="#{userSession.formatTime(recipeDetailBean.recipe.cooktime)}" | ||||
|                                     /> | ||||
|                                 </p:panelGrid> | ||||
|                             </p:panelGrid> | ||||
|                             <h:commandLink value="Edit Details" | ||||
|                                 action="#{recipeDetailBean.editDescription}" | ||||
|  | @ -85,7 +95,9 @@ | |||
|                                 /> | ||||
|                             </h:commandLink> | ||||
|                             <!--  --> | ||||
|                             <p:panelGrid id="pnlInstr" columns="1"  style="width: 100%"> | ||||
|                             <p:panelGrid id="pnlInstr" | ||||
|                                 columns="1" style="width: 100%" | ||||
|                             > | ||||
|                                 <f:facet name="header"> | ||||
|                                     <h:outputText | ||||
|                                         styleClass="subtitle" | ||||
|  | @ -101,7 +113,9 @@ | |||
|                                     action="#{recipeDetailBean.editInstructions}" | ||||
|                                 /> | ||||
|                             </p:panelGrid> | ||||
|                             <p:panelGrid id="pnlNotes" columns="1" style="width: 100%"> | ||||
|                             <p:panelGrid id="pnlNotes" | ||||
|                                 columns="1" style="width: 100%" | ||||
|                             > | ||||
|                                 <f:facet name="header"> | ||||
|                                     <h:outputText | ||||
|                                         styleClass="subtitle" | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user