Change Definition to DID Number in entire UI.

6 files changed, 16 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index df643ae..4ac0dee 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ VERSION=0.0.1
 
 APP_DIST=\
 	did*	\
-	template-did-editdefinition-html.lsp	\
 	template-searchdefinitionlist-text.lsp	\
 
 JS_DIST=jquery.autocomplete.css	\
diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp
index 472cf84..138e029 100644
--- a/did-assigndefinition-html.lsp
+++ b/did-assigndefinition-html.lsp
@@ -61,7 +61,7 @@
 	});
 </script>
 
-<H1>Assign Definition</H1>
+<H1>Assign DID Number</H1>
 <DL>
 <% if form.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(form.descr), "\n", "<BR>") .. " " .. form.value.did.value .. "</P>\n") end %>
 <% if form.errtxt then
diff --git a/did-controller.lua b/did-controller.lua
index 77f498c..1dceb94 100644
--- a/did-controller.lua
+++ b/did-controller.lua
@@ -30,20 +30,20 @@ function searchdefinitionlist(self)
 end
 
 function editdefinition(self)
-	return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Edit Definition", "Definition Saved")
+	return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Edit DID Number", "DID Number Saved")
 end
 
 function createdefinition(self)
-	return controllerfunctions.handle_form(self, self.model.getdefinition, self.model.savedefinition, self.clientdata, "Save", "Create Definition", "Definition Created")
+	return controllerfunctions.handle_form(self, self.model.getdefinition, self.model.savedefinition, self.clientdata, "Save", "Create DID Number", "DID Number Created")
 end
 
 function assigndefinition(self)
 	self.conf.viewtype = self.clientdata.viewtype or self.conf.viewtype
-	return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Assign Definition", "Definition Saved")
+	return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Assign DID Number", "DID Number Saved")
 end
 
 function newdefinition(self)
-	local retval = controllerfunctions.handle_form(self, self.model.getunuseddefinition, self.model.setunuseddefinition, self.clientdata, "Select", "Create New Definition")
+	local retval = controllerfunctions.handle_form(self, self.model.getunuseddefinition, self.model.setunuseddefinition, self.clientdata, "Select", "Create New DID Number")
 	if retval.value.did and not retval.errtxt then
 		-- Successfully found an unused did, redirect to edit it
 		self:redirect("editdefinition?did="..retval.value.did.value.."&redir=listdefinitions")
diff --git a/did-model.lua b/did-model.lua
index f6f6858..866103c 100644
--- a/did-model.lua
+++ b/did-model.lua
@@ -558,13 +558,13 @@ end
 
 local function createdefinitionlist(did, extension, identification, description, department)
 	local retval = {}
-	retval.definitions = cfe({ type="list", value={}, label="DID Definition List" })
+	retval.definitions = cfe({ type="list", value={}, label="DID Number List" })
 	retval.did = cfe({ value=did or "", label="DID search string" })
 	retval.extension = cfe({ value=extension or "", label="Extension search string" })
 	retval.identification = cfe({ value=identification or "", label="Identification search string" })
 	retval.description = cfe({ value=description or "", label="Description search string" })
 	retval.department = cfe({ value=department or "", label="Department search string" })
-	return cfe({ type="group", value=retval, label="DID Definition List" })
+	return cfe({ type="group", value=retval, label="DID Number List" })
 end
 
 local function stripdash(did)
@@ -726,9 +726,9 @@ function savedefinition(defin, exists)
 			end
 			local def = listdefinitions(definition.did)
 			if #def > 0 and not exists then
-				defin.value.did.errtxt = "Definition already exists"
+				defin.value.did.errtxt = "DID Number already exists"
 			elseif #def == 0 and exists then
-				defin.value.did.errtxt = "Definition does not exist"
+				defin.value.did.errtxt = "DID Number does not exist"
 			else
 				if exists then
 					updatedefinitionentry(definition)
@@ -754,7 +754,7 @@ function updatedefinition(defin)
 end
 
 function deletedefinition(did)
-	local result = cfe({ label="Delete Definition Result", errtxt="Definition does not exist" })
+	local result = cfe({ label="Delete DID Number Result", errtxt="DID Number does not exist" })
 	did = stripdash(did)
 	local res, err = pcall(function()
 		databasedisconnect()
@@ -763,7 +763,7 @@ function deletedefinition(did)
 		local def = listdefinitions(did)
 		if #def == 1 then
 			deletedefinitionentry(did)
-			result.value = "Definition Deleted"
+			result.value = "DID Number Deleted"
 			result.errtxt = nil
 		end
 		databasedisconnect()
@@ -794,7 +794,7 @@ function getunuseddefinition()
 	if not res and err then
 		errtxt = err
 	end
-	return cfe({ type="group", value=retval, label="Create New Definition" })
+	return cfe({ type="group", value=retval, label="Create New DID Number" })
 end
 
 function setunuseddefinition(defin)
diff --git a/did-searchdefinitions-html.lsp b/did-searchdefinitions-html.lsp
index 636f04f..e05846f 100644
--- a/did-searchdefinitions-html.lsp
+++ b/did-searchdefinitions-html.lsp
@@ -2,7 +2,7 @@
 require("viewfunctions")
 %>
 
-<H1>Search Definitions</H1>
+<H1>Search DID Numbers</H1>
 <form action="/cgi-bin/acf/did/did/listdefinitions" method="POST">
 <DL>
 <DT>DID</DT>
diff --git a/did.menu b/did.menu
index 9bd7454..5948e09 100644
--- a/did.menu
+++ b/did.menu
@@ -3,8 +3,8 @@ Applications 	41DID			Status		status
 Applications 	41DID			Search		searchdefinitions
 Applications 	41DID			New		newdefinition
 Applications 	41DID			Assign		assigndefinition
-Applications 	41DID			Definitions	listdefinitions
-Applications 	41DID			Used_Definitions	listuseddefinitions
-Applications 	41DID			Unused_Definitions	listunuseddefinitions
+Applications 	41DID			DID_Numbers	listdefinitions
+Applications 	41DID			Used_DID_Numbers	listuseddefinitions
+Applications 	41DID			Unused_DID_Numbers	listunuseddefinitions
 Applications 	41DID			Create		createdefinition
 Applications 	41DID			History		viewactivitylog