=> Amount: diff --git a/meta.php b/meta.php index e99e36a..2b511ed 100644 --- a/meta.php +++ b/meta.php @@ -39,7 +39,7 @@ $commonHeaders .= str_replace("&", "&", $xajax->getJavascript($config->_jsUr switch ( $config->_thisScript ) { - case "view_food.php": + case "view_food": $myHeaders = << @@ -51,7 +51,7 @@ $commonHeaders HEADERS; break; - case "view_meal.php": + case "view_meal": $myHeaders = << @@ -63,7 +63,7 @@ $commonHeaders HEADERS; break; - case "view_diary.php": + case "view_diary": $myHeaders = << @@ -75,7 +75,7 @@ $commonHeaders HEADERS; break; - case "register.php": + case "register": $myHeaders = << @@ -87,7 +87,7 @@ $commonHeaders HEADERS; break; - case "edit_account.php": + case "edit_account": $myHeaders = << diff --git a/nutrient_chooser.php b/nutrient_chooser.php index fb1f1da..fa105b2 100644 --- a/nutrient_chooser.php +++ b/nutrient_chooser.php @@ -58,7 +58,7 @@ if ( isset($_POST['setNutrients']) ) { $_SESSION['systemMsg'] = "There were errors saving your nutrient list."; } # redirect the user back to this same page with a GET request - header("Location: {$config->_rootUri}/nutrient_chooser.php"); + header("Location: {$config->_rootUri}/nutrient_chooser"); exit; } diff --git a/templates/about.tpl b/templates/about.tpl index 9abfd03..7bad288 100644 --- a/templates/about.tpl +++ b/templates/about.tpl @@ -9,7 +9,7 @@

The software that runs this site is free. It is released under an MIT (X11) - license. You can download the source code and the + license. You can download the source code and the database, alter it, improve it or otherwise do whatever you like with it. If you'd like to help improve NutriDB, then feel free to send patches or other improvements. diff --git a/templates/download.tpl b/templates/download.tpl index 340a5bf..e98c7af 100644 --- a/templates/download.tpl +++ b/templates/download.tpl @@ -7,7 +7,7 @@

DOWNLOAD

- The software that runs NutriDB is released under an MIT (X11) license. + The software that runs NutriDB is released under an MIT (X11) license.

diff --git a/templates/edit_meal.tpl b/templates/edit_meal.tpl index 70617cf..a6b1470 100644 --- a/templates/edit_meal.tpl +++ b/templates/edit_meal.tpl @@ -19,7 +19,7 @@ {/if}

- +

{if $editMeal} diff --git a/templates/food_quantity.tpl b/templates/food_quantity.tpl index 4f4e6d9..824861f 100644 --- a/templates/food_quantity.tpl +++ b/templates/food_quantity.tpl @@ -16,7 +16,7 @@ enter your own quantity, any decimal number is allowable, including fractionals.

- +

Select a predefined quantity/weight: diff --git a/templates/food_search.tpl b/templates/food_search.tpl index 4c488e7..e265360 100644 --- a/templates/food_search.tpl +++ b/templates/food_search.tpl @@ -12,7 +12,7 @@ {if isset($searchResults)}

The following items matched your search. - Select one, or refine your search. + Select one, or refine your search.

{if $sortType == "Category"} @@ -21,11 +21,11 @@ {foreach from=$foodCat.searchResults item=searchResult}

{if $category == "userFood"} - {$searchResult.foodDesc} + {$searchResult.foodDesc} {elseif $category == "userMeal"} - {$searchResult.foodDesc} + {$searchResult.foodDesc} {else} - {$searchResult.foodDesc} + {$searchResult.foodDesc} {/if}

{/foreach} @@ -34,11 +34,11 @@ {foreach from=$searchResults item=searchResult}

{if $searchResult.category == "userFood"} - {$searchResult.foodDesc|escape:"html"} + {$searchResult.foodDesc|escape:"html"} {elseif $searchResult.category == "userMeal"} - {$searchResult.foodDesc|escape:"html"} + {$searchResult.foodDesc|escape:"html"} {else} - {$searchResult.foodDesc|escape:"html"} + {$searchResult.foodDesc|escape:"html"} {/if}

{/foreach} @@ -52,10 +52,10 @@ No items matched your search.

- Would you like to refine your search? + Would you like to refine your search?

- Don't understand the search options? See the help on searching. + Don't understand the search options? See the help on searching.

{/if}

diff --git a/templates/footer.tpl b/templates/footer.tpl index 648ce1d..be3eff6 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -1,8 +1,8 @@ diff --git a/templates/header.tpl b/templates/header.tpl index cd64c20..f8331f3 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -4,7 +4,7 @@ {$myHeaders} -{if $config->_thisScript == "index.php"} +{if $config->_thisScript == "/"} {else} @@ -20,19 +20,19 @@ {if isset($isLoggedIn)}

Hi {$smarty.session.user.username|escape:"html"}.
- [Logout] + [Logout]

{else}

- +

- Register. + Register.

@@ -41,11 +41,11 @@

{$systemMsg}

diff --git a/templates/index.tpl b/templates/index.tpl index 809f022..b7de395 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -3,14 +3,14 @@

Welcome to NutriDB. NutriDB is simple tool which allows you to view nutritional information for a particular food, or calculate the nutritional profile of a whole recipe.

- The default search options are fine for most + The default search options are fine for most people, but a few extras are added for anyone needing or wanting a bit of extra control. Just type something in the search box and press the Search button to get started. @@ -77,7 +77,7 @@ the highest concentrations of the specified nutrient.

- +

@@ -41,7 +41,7 @@ {/if} {if $favMeals}

- +

Meals:
@@ -107,17 +107,17 @@

- Edit foods - use this section to edit any/all foods, + Edit foods - use this section to edit any/all foods, not just favorites.

- Edit recipes - use this section to edit any/all recipes, + Edit recipes - use this section to edit any/all recipes, not just favorites.

- +

Create a new diary named @@ -126,7 +126,7 @@

- Edit your list of standard nutrients. There is + Edit your list of standard nutrients. There is a large number of nutrients available for most foods. Usually you will not be concerned with the majority of them, but rather only a small percentage of the available nutrients. Use this section to filter out the nutrients you do not want @@ -135,10 +135,10 @@

- Edit your profile. Here you can change + Edit your profile. Here you can change things like your password, username, birthday or gender. diff --git a/templates/nutrient_search.tpl b/templates/nutrient_search.tpl index 1f3173c..146cb0b 100644 --- a/templates/nutrient_search.tpl +++ b/templates/nutrient_search.tpl @@ -16,7 +16,7 @@

({$searchResult.nutr_val}{$searchResult.units}) {$searchResult.foodDesc}
({$searchResult.nutr_val}{$searchResult.units}) {$searchResult.foodDesc}

@@ -28,10 +28,10 @@ No items matched your search.

- Would you like to refine your search? + Would you like to refine your search?

- Don't understand the search options? See the help on searching. + Don't understand the search options? See the help on searching.

{/if}

diff --git a/templates/register.tpl b/templates/register.tpl index 94a36ae..d2edd0c 100644 --- a/templates/register.tpl +++ b/templates/register.tpl @@ -16,7 +16,7 @@ address, or any other personal/private information, nor does nutridb.org want this information. Below you simply need to select a unique login name, a password and basic age/gender information. For more information see the help regarding - why you might want to register. + why you might want to register.

diff --git a/templates/sidebar_left.tpl b/templates/sidebar_left.tpl index d17a8d5..5821eb8 100644 --- a/templates/sidebar_left.tpl +++ b/templates/sidebar_left.tpl @@ -4,11 +4,11 @@ {foreach from=$currentMealItems key=key item=currentMealItem}

- {$currentMealItem.description|escape:"html"} + {$currentMealItem.description|escape:"html"}

{/foreach}

- View recipe | + View recipe | Clear recipe

{else} @@ -19,7 +19,7 @@

Favorites:

{if $favFoods} -

{if $userDiaries} - +

@@ -44,7 +44,7 @@ with - timestamp + timestamp