mtsinc7
/
gourmetj-springboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI tweaks

Browse Source
version2
Tim Holloway 2 years ago
parent 94c64b6bde
commit 5ef369743a
5 changed files with 77 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      application.properties
  2. 4
      src/main/resources/META-INF/resources/application.yml
  3. 15
      src/main/resources/META-INF/resources/detailEdit.xhtml
  4. 23
      src/main/resources/META-INF/resources/main.xhtml
  5. 92
      src/main/resources/META-INF/resources/recipeDetails.xhtml

6
application.properties
Unescape View File

@ -1,8 +1,8 @@
joinfaces.jsf.project-stage=development 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.url=jdbc:sqlite:/home/timh/foo/bazz/recipes.db
#spring.datasource.username=dbuser #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.datasource.driverClassName=org.sqlite.JDBC
#spring.jpa.hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect #spring.jpa.hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect
spring.jpa.database-platform=org.sqlite.hibernate.dialect.SQLiteDialect spring.jpa.database-platform=org.sqlite.hibernate.dialect.SQLiteDialect
#spring.jpa.show-sql: true #spring.jpa.show-sql: true

4
src/main/resources/META-INF/resources/application.yml
Unescape View File

@ -1,7 +1,3 @@
server:
context-path: /codenotfound
port: 9090
spring: spring:
datasource: datasource:
url: jdbc:sqlite:/home/timh/foo/bazz/recipes.db url: jdbc:sqlite:/home/timh/foo/bazz/recipes.db

15
src/main/resources/META-INF/resources/detailEdit.xhtml
Unescape View File

@ -38,7 +38,7 @@
<p:outputLabel for="@next" <p:outputLabel for="@next"
value="Title" value="Title"
/> />
<p:inputText id="rtitle" size="30" <p:inputText id="rtitle" size="45"
required="true" focus="true" required="true" focus="true"
value="#{recipeDetailBean.recipe.title}" value="#{recipeDetailBean.recipe.title}"
> >
@ -84,13 +84,13 @@
<p:outputLabel for="@next" <p:outputLabel for="@next"
value="Source" value="Source"
/> />
<p:inputText id="rsource" size="30" <p:inputText id="rsource" size="45"
value="#{recipeDetailBean.recipe.source}" value="#{recipeDetailBean.recipe.source}"
/> />
<p:outputLabel for="@next" <p:outputLabel for="@next"
value="URL" value="URL"
/> />
<p:inputText id="rurl" size="30" <p:inputText id="rurl" size="45"
value="#{recipeDetailBean.recipe.link}" value="#{recipeDetailBean.recipe.link}"
/> />
<p:outputLabel for="@next" <p:outputLabel for="@next"
@ -198,16 +198,17 @@
</p:selectBooleanCheckbox> </p:selectBooleanCheckbox>
</p:column> </p:column>
<p:column label="Amt" <p:column label="Amt"
style="width: 4em; text-align: right" style="width: 4em"
> >
<p:inputText id="ingAmt" size="5" <p:inputText id="ingAmt" size="5"
value="#{item.displayAmount}" value="#{item.displayAmount}"
style="text-align: right"
rendered="#{not item.ingGroup}" rendered="#{not item.ingGroup}"
> >
</p:inputText> </p:inputText>
</p:column> </p:column>
<p:column label="Units" <p:column label="Units"
style="width: 6em" style="width: 7em"
> >
<p:inputText id="ingUnit" <p:inputText id="ingUnit"
value="#{item.unit}" size="10" value="#{item.unit}" size="10"
@ -216,7 +217,7 @@
</p:inputText> </p:inputText>
</p:column> </p:column>
<p:column label="Item" style="width: 22em"> <p:column label="Item" style="width: 22em">
<p:inputText id="ingItem" size="20" <p:inputText id="ingItem" size="35"
value="#{item.item}" value="#{item.item}"
> >
</p:inputText> </p:inputText>
@ -233,7 +234,7 @@
</p:column> </p:column>
<p:column label="Key"> <p:column label="Key">
<p:inputText id="ingKey" <p:inputText id="ingKey"
value="#{item.ingkey}" size="12" value="#{item.ingkey}" size="20"
rendered="#{not item.ingGroup}" rendered="#{not item.ingGroup}"
/> />
</p:column> </p:column>

23
src/main/resources/META-INF/resources/main.xhtml
Unescape View File

@ -10,16 +10,19 @@
<h:form id="form1"> <h:form id="form1">
<p:panelGrid label="Find a Recipe" columns="1"> <p:panelGrid label="Find a Recipe" columns="1">
<p:panelGrid columns="3"> <p:panelGrid columns="3">
<p:inputText id="searchFor" <span class="ui-input-icon-left"> <i
placeholder="Recipe title (todo) cuisine, etc." class="pi pi-search"
styleClass="redBox" accesskey="f" /> <p:inputText id="searchFor" width="45"
value="#{adminMainBean.searchText}" placeholder="Recipe title (todo) cuisine, etc."
> styleClass="redBox" accesskey="f"
<f:ajax event="change" execute="@this" value="#{adminMainBean.searchText}"
render="@form" >
listener="#{adminMainBean.ajaxUpdateList}" <f:ajax event="change"
/> execute="@this" render="@form"
C </p:inputText> listener="#{adminMainBean.ajaxUpdateList}"
/>
</p:inputText>
</span>
<p:button id="find" value="Find" <p:button id="find" value="Find"
defaultCommand="true" defaultCommand="true"
action="#{adminMainBean.doFind}" action="#{adminMainBean.doFind}"

92
src/main/resources/META-INF/resources/recipeDetails.xhtml
Unescape View File

@ -37,44 +37,54 @@
</f:facet> </f:facet>
<p:row> <p:row>
<p:column id="leftCol" style="width: 80%"> <p:column id="leftCol" style="width: 80%">
<img id="bigpix" <p:panelGrid columns="2">
src="/img/picture/#{recipeDetailBean.recipe.id}" <img id="bigpix"
/> src="/img/picture/#{recipeDetailBean.recipe.id}"
<p:panelGrid id="pnlDetails" columns="2">
<p:commandButton value="&lt;- 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 id="pnlDetails"
columns="2"
>
<p:commandButton
value="&lt;- 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> </p:panelGrid>
<h:commandLink value="Edit Details" <h:commandLink value="Edit Details"
action="#{recipeDetailBean.editDescription}" action="#{recipeDetailBean.editDescription}"
@ -85,7 +95,9 @@
/> />
</h:commandLink> </h:commandLink>
<!-- --> <!-- -->
<p:panelGrid id="pnlInstr" columns="1" style="width: 100%"> <p:panelGrid id="pnlInstr"
columns="1" style="width: 100%"
>
<f:facet name="header"> <f:facet name="header">
<h:outputText <h:outputText
styleClass="subtitle" styleClass="subtitle"
@ -101,7 +113,9 @@
action="#{recipeDetailBean.editInstructions}" action="#{recipeDetailBean.editInstructions}"
/> />
</p:panelGrid> </p:panelGrid>
<p:panelGrid id="pnlNotes" columns="1" style="width: 100%"> <p:panelGrid id="pnlNotes"
columns="1" style="width: 100%"
>
<f:facet name="header"> <f:facet name="header">
<h:outputText <h:outputText
styleClass="subtitle" styleClass="subtitle"

Write Preview
Loading…
Cancel
Save