Modified titles in case directory submission and download case study

4 files changed, 12 insertions, 12 deletions

diff --git a/abstract_bulk_approval.inc b/abstract_bulk_approval.inc
index 72e8f74..87ba9f0 100755
--- a/abstract_bulk_approval.inc
+++ b/abstract_bulk_approval.inc
@@ -396,7 +396,7 @@ function _case_study_details($case_study_proposal_id)
 	$return_html .= '<strong>Proposer Name:</strong><br />' . $abstracts_pro->name_title . ' ' . $abstracts_pro->contributor_name . '<br /><br />';
 	$return_html .= '<strong>Title of the case study Project:</strong><br />' . $abstracts_pro->project_title . '<br /><br />';
 	$return_html .= '<strong>Uploaded an abstract (brief outline) of the project:</strong><br />' . $abstract_filename . '<br /><br />';
-	$return_html .= '<strong>Upload the eSim circuit simulation for the developed process:</strong><br />' . $abstracts_query_process_filename . '<br /><br />';
+	$return_html .= '<strong>Uploaded Case Directory Folder:</strong><br />' . $abstracts_query_process_filename . '<br /><br />';
 	$return_html .= $download_case_study;
 	return $return_html;
 }
diff --git a/cfd_case_study.module b/cfd_case_study.module
index f0923c0..dbd9ad0 100755
--- a/cfd_case_study.module
+++ b/cfd_case_study.module
@@ -34,7 +34,7 @@ function cfd_case_study_menu()
 	);
 	$items['case-study-project/manage-proposal/pending'] = array(
 		'title'=> 'Pending Proposals',
-		'description'=> 'Pending  Case Study Proposals Queue',
+		'description'=> 'Pending Case Study Proposals Queue',
 		'page callback'=> 'cfd_case_study_proposal_pending',
 		'access callback'=> 'user_access',
 		'access arguments'=> array(
@@ -398,7 +398,7 @@ function cfd_case_study_get_proposal()
 	$proposal_data = $proposal_q->fetchObject();
 	if (!$proposal_data)
 	{
-		drupal_set_message("You do not have any approved  Case Study proposal. Please propose the Case Study proposal", 'error');
+		drupal_set_message("You do not have any approved  Case Study proposal. Please propose a Case Study", 'error');
 		drupal_goto('');
 	} //!$proposal_data
 	switch ($proposal_data->approval_status)
diff --git a/full_download.inc b/full_download.inc
index f3fbc00..3675870 100755
--- a/full_download.inc
+++ b/full_download.inc
@@ -28,8 +28,8 @@ function cfd_case_study_download_full_project()
 	$query->fields('case_study_submitted_abstracts_file');
 	$query->condition('proposal_id', $id);
 	$project_files = $query->execute();
-	while ($esim_project_files = $project_files->fetchObject()) {
-		$zip->addFile($root_path . $CASE_STUDY_PATH . $esim_project_files->filepath, $CASE_STUDY_PATH . str_replace(' ', '_', basename($esim_project_files->filename)));
+	while ($cfd_project_files = $project_files->fetchObject()) {
+		$zip->addFile($root_path . $CASE_STUDY_PATH . $cfd_project_files->filepath, $CASE_STUDY_PATH . str_replace(' ', '_', basename($cfd_project_files->filename)));
 	}
 	$zip_file_count = $zip->numFiles;
 	$zip->close();
@@ -93,8 +93,8 @@ function circuit_simulation_download_completed_project()
 	$query->condition('proposal_id', $id);
 	$project_files = $query->execute();
 	//var_dump($root_path . $CASE_STUDY_PATH . 'project_files/');die;
-	while ($esim_project_files = $project_files->fetchObject()) {
-		$zip->addFile($root_path . $CASE_STUDY_PATH . 'project_files/' . $esim_project_files->filepath, $CASE_STUDY_PATH . str_replace(' ', '_', basename($esim_project_files->filename)));
+	while ($cfd_project_files = $project_files->fetchObject()) {
+		$zip->addFile($root_path . $CASE_STUDY_PATH . 'project_files/' . $cfd_project_files->filepath, $CASE_STUDY_PATH . str_replace(' ', '_', basename($cfd_project_files->filename)));
 	}
 	$zip_file_count = $zip->numFiles;
 	$zip->close();
diff --git a/upload_code.inc b/upload_code.inc
index d95a226..42efe22 100755
--- a/upload_code.inc
+++ b/upload_code.inc
@@ -59,7 +59,7 @@ function cfd_case_study_abstract()
 		}
 		if ($abstracts_q->is_submitted == '')
 		{
-			$url = l('Upload abstract', 'case-study-project/abstract-code/upload');
+			$url = l('Upload Case Directory', 'case-study-project/abstract-code/upload');
 		} //$abstracts_q->is_submitted == ''
 		else if ($abstracts_q->is_submitted == 1)
 		{
@@ -72,13 +72,13 @@ function cfd_case_study_abstract()
 	} //$abstracts_query_process == TRUE
 	else
 	{
-		$url = l('Upload abstract', 'case-study-project/abstract-code/upload');
+		$url = l('Upload Case Directory', 'case-study-project/abstract-code/upload');
 		$abstracts_query_process_filename = "File not uploaded";
 	}
 	$return_html .= '<strong>Contributor Name:</strong><br />' . $proposal_data->name_title . ' ' . $proposal_data->contributor_name . '<br /><br />';
 	$return_html .= '<strong>Title of the Case Study Project:</strong><br />' . $proposal_data->project_title . '<br /><br />';
 	$return_html .= '<strong>Uploaded abstract of the project:</strong><br />' . $abstract_filename . '<br /><br />';
-	$return_html .= '<strong>Uploaded project files:</strong><br />' . $abstracts_query_process_filename . '<br /><br />';
+	$return_html .= '<strong>Uploaded Case Directory:</strong><br />' . $abstracts_query_process_filename . '<br /><br />';
 	$return_html .= $url . '<br />';
 	return $return_html;
 }
@@ -123,7 +123,7 @@ function cfd_case_study_upload_abstract_code_form($form, &$form_state)
 	{
 		if ($abstracts_q->is_submitted == 1)
 		{
-			drupal_set_message(t('You have already submited your project files, hence you can not upload more code, for any query please write to us.'), 'error', $repeat = FALSE);
+			drupal_set_message(t('You have already submited your Case Directory, hence you can not upload any more, for any query please write to us.'), 'error', $repeat = FALSE);
 			drupal_goto('case-study-project/abstract-code');
 			//return;
 		} //$abstracts_q->is_submitted == 1
@@ -146,7 +146,7 @@ function cfd_case_study_upload_abstract_code_form($form, &$form_state)
 	} //!$existing_uploaded_S_file
 	$form['upload_case_study_developed_process'] = array(
 		'#type' => 'file',
-		'#title' => t('Upload the Project Files'),
+		'#title' => t('Upload the Case Directory'),
 		//'#required' => TRUE,
 		'#description' => t('<span style="color:red;">Current File :</span> ' . $existing_uploaded_S_file->filename . '<br />Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . t('<span style="color:red;">Allowed file extensions : ') . variable_get('case_study_project_files_extensions', '') . '</span>'
 	);