Refs #774 Adding a 'cancel' link below the add/edit Goals forms (to restore screen state previous to click)

git-svn-id: http://dev.piwik.org/svn/trunk@2326 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 19 insertions, 2 deletions

diff --git a/plugins/Goals/templates/GoalForm.js b/plugins/Goals/templates/GoalForm.js
index 2f79f09729..13ed40ba5e 100644
--- a/plugins/Goals/templates/GoalForm.js
+++ b/plugins/Goals/templates/GoalForm.js
@@ -1,20 +1,37 @@
 
 function showAddNewGoal()
 {
+	hideForms();
 	$("#GoalForm").show();
-	$("#EditGoals").hide();
+	showCancel();
 	piwikHelper.lazyScrollTo("#AddEditGoals", 400);
 	return false;
 }
 
 function showEditGoals()
 {
+	hideForms();
 	$("#EditGoals").show();
-	$("#GoalForm").hide();
+	showCancel();
 	piwikHelper.lazyScrollTo("#AddEditGoals", 400);
 	return false;
 }
 
+function hideForms()
+{
+	$("#GoalForm").hide();
+	$("#EditGoals").hide();
+}
+
+function showCancel()
+{
+	$("#goalsCancel").show();
+	$('#goalsCancelLink').click( function(){
+		hideForms();
+		$("#goalsCancel").hide();
+	});
+}
+
 // init the goal form with existing goal value, if any
 function initGoalForm(goalMethodAPI, submitText, goalName, matchAttribute, pattern, patternType, caseSensitive, revenue, goalId)
 {