summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2012-11-14 20:49:06 +0000
committerNathan Kinkade <nath@nkinka.de>2012-11-14 20:49:06 +0000
commitf3aef2ec03ba9f00d9c4a9c4cf0f6a0f8c051468 (patch)
tree3163a2c193f40a6a7059b124d605b493975fa0f1
parent4c9e1b32a4ffb2fdcf04e691e83c5e52eed186ff (diff)
More changing of meal to recipe.
-rw-r--r--js/site.js22
-rw-r--r--view_meal.php8
2 files changed, 15 insertions, 15 deletions
diff --git a/js/site.js b/js/site.js
index 9e4afd7..a1120ae 100644
--- a/js/site.js
+++ b/js/site.js
@@ -278,9 +278,9 @@ function validateEditMeal(formId) {
}
if ( myForm.action.value == "Delete" ) {
- var msg = "WARNING: If you choose to remove this meal it will also be " +
+ var msg = "WARNING: If you choose to remove this recipe it will also be " +
"removed from any diary to which you may have added it. Are you sure you want to " +
- "permanently delete this saved meal?\n\n" + myOldName;
+ "permanently delete this saved recipe?\n\n" + myOldName;
if ( window.confirm(msg) ) {
return true;
} else {
@@ -288,14 +288,14 @@ function validateEditMeal(formId) {
}
} else if ( myForm.action.value == "Rename") {
if ( empty(myForm.newMealName.value) ) {
- var msg = "You must specify a new name when renaming a saved meal.";
+ var msg = "You must specify a new name when renaming a saved recipe.";
alert(msg);
return false;
}
} else if ( myForm.action.value == "Modify") {
// make sure that the description isn't empty
if ( empty(myForm.mealDesc.value) ) {
- var msg = "You must specify a description for the meal.";
+ var msg = "You must specify a description for the recipe.";
alert(msg);
myForm.mealDesc.focus();
return false;
@@ -309,19 +309,19 @@ function validateEditMeal(formId) {
for ( idx = 0; idx < itemIds.length; idx++ ) {
var itemDesc = getElement("mealItemDesc-" + itemIds[idx]).value;
if ( empty(itemDesc) ) {
- var msg = "You must specify a description for each meal item.";
+ var msg = "You must specify a description for each recipe item.";
alert(msg);
getElement("mealItemDesc-" + itemIds[idx]).focus();
return false;
}
if ( empty(getElement("mealItemQuantity-" + itemIds[idx]).value) ) {
- var msg = "You must specify an amount for meal item '" + itemDesc + "'.";
+ var msg = "You must specify an amount for recipe item '" + itemDesc + "'.";
alert(msg);
getElement("mealItemQuantity-" + itemIds[idx]).focus();
return false;
} else {
if ( isNaN(getElement("mealItemQuantity-" + itemIds[idx]).value) ) {
- var msg = "The amount for meal item '" + itemDesc + "' must be a number.";
+ var msg = "The amount for recipe item '" + itemDesc + "' must be a number.";
alert(msg);
getElement("mealItemQuantity-" + itemIds[idx]).focus();
return false;
@@ -378,7 +378,7 @@ function validateEditDiary(formId) {
function verifyRemoveCurrentMealItem(mealItem) {
var itemDesc = getElement("currentMealItemDesc-" + mealItem).text;
- var msg = "Are you sure you want to remove this item from the current meal?\n\n" + itemDesc;
+ var msg = "Are you sure you want to remove this item from the current recipe?\n\n" + itemDesc;
if ( window.confirm(msg) ) {
xajax_removeCurrentMealItem(mealItem);
@@ -394,7 +394,7 @@ function verifyRemoveCurrentMealItem(mealItem) {
function verifyClearCurrentMeal() {
- var msg = "Are you sure you want to clear/reset the entire current meal?\n";
+ var msg = "Are you sure you want to clear/reset the entire current recipe?\n";
if ( window.confirm(msg) ) {
xajax_clearCurrentMeal();
@@ -439,7 +439,7 @@ function validateAddMeal(formId,mealDesc) {
var myMealDesc = getElement(mealDesc);
if ( empty(myMealDesc.value) ) {
- var msg = "You must give the meal a description.";
+ var msg = "You must give the recipe a description.";
myForm.description.focus();
alert(msg);
return false;
@@ -462,7 +462,7 @@ function validateAddMeal(formId,mealDesc) {
function verifyRemoveMealItem(mealItem) {
var itemDesc = getElement("mealItemDesc-" + mealItem).value;
- var msg = "Are you sure you want to permanently delete this item from the meal?\n\n" + itemDesc;
+ var msg = "Are you sure you want to permanently delete this item from the recipe?\n\n" + itemDesc;
if ( window.confirm(msg) ) {
xajax_removeMealItem(mealItem);
diff --git a/view_meal.php b/view_meal.php
index 20ff14c..c5da293 100644
--- a/view_meal.php
+++ b/view_meal.php
@@ -32,7 +32,7 @@ if ( isset($_POST['action']) && ($_POST['action'] == "viewMeal") ) {
# don't go forward if there isn't a meal or it isn't a number
if ( ! isset($_GET['meal']) || ! is_numeric($_GET['meal']) ) {
- $_SESSION['systemMsg'] = "<span class='msgError'>You must specify a numeric meal ID.</span>";
+ $_SESSION['systemMsg'] = "<span class='msgError'>You must specify a numeric recipe ID.</span>";
header("Location: {$config->_previousUri}");
exit;
}
@@ -44,9 +44,9 @@ if ( $_GET['meal'] == "0" ) {
# back to wherever they were before
if ( isset($_SESSION['currentMeal']) && count($_SESSION['currentMeal'])) {
$currentMeal = $_SESSION['currentMeal'];
- $smarty->assign("mealDesc", "(Current meal)");
+ $smarty->assign("mealDesc", "(Current recipe)");
} else {
- $_SESSION['systemMsg'] = "<span class='msgError'>The current meal has no items to view.</span>";
+ $_SESSION['systemMsg'] = "<span class='msgError'>The current recipe has no items to view.</span>";
header("Location: {$config->_previousUri}");
}
} else {
@@ -71,7 +71,7 @@ if ( $_GET['meal'] == "0" ) {
$currentMeal[$idx]['description'] = $db->_rows[$idx]['description'];
}
} else {
- $_SESSION['systemMsg'] = "<span class='msgError'>Sorry, that meal doesn't exist.</span>";
+ $_SESSION['systemMsg'] = "<span class='msgError'>Sorry, that recipe doesn't exist.</span>";
header("Location: {$config->_previousUri}");
exit;
}