Merge pull request #1 from Sashi20/master

Modify URLs for Flowsheeting Project

10 files changed, 98 insertions, 98 deletions

diff --git a/abstract_approval.inc b/abstract_approval.inc
index 9c4a592..ea31a13 100755
--- a/abstract_approval.inc
+++ b/abstract_approval.inc
@@ -72,7 +72,7 @@ function om_flowsheet_abstract_approval()
   }
 function om_flowsheet_abstract_approval_form($form, &$form_state)
   {
-    $solution_id = (int) arg(3);
+    $solution_id = (int) arg(4);
     /* get solution details */
     //$solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE id = %d", $solution_id);
     $query = db_select('lab_migration_solution');
@@ -264,7 +264,7 @@ function om_flowsheet_abstract_approval_form_validate($form, &$form_state)
 function om_flowsheet_abstract_approval_form_submit($form, &$form_state)
   {
     global $user;
-    $solution_id = (int) arg(3);
+    $solution_id = (int) arg(4);
     /* get solution details */
     //$solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE id = %d", $solution_id);
     $query = db_select('lab_migration_solution');
diff --git a/abstract_bulk_approval.inc b/abstract_bulk_approval.inc
index 1cdb66b..50ffbfe 100755
--- a/abstract_bulk_approval.inc
+++ b/abstract_bulk_approval.inc
@@ -150,7 +150,7 @@ Full Name: ' . $user_info->name_title . ' ' . $user_info->contributor_name . '
 Project Title: ' . $user_info->project_title . '
 Name of compound for which process development is carried out  : ' . $user_info->process_development_compound_name . '
 
-Kindly send us the internship forms available at https://om.fossee.in/flowsheeting-project/internship/forms as early as possible for processing your honorarium on time. In case you have already sent these forms, please share the the consignment number or tracking id with us.
+Kindly send us the internship forms available at https://om.fossee.in/chemical/flowsheeting-project/internship/forms as early as possible for processing your honorarium on time. In case you have already sent these forms, please share the the consignment number or tracking id with us.
 
 Note: It will take upto 45 days from the time we receive your forms, to process your honorarium.
 
@@ -231,7 +231,7 @@ Project Title: ' . $user_info->project_title . '
 Name of compound for which process development is carried out  : ' . $user_info->process_development_compound_name . '
 Reason for Disapproval / Feedback: ' . $form_state['values']['disapprove_message'] . ' 
  
-You are requested to visit the Abstract and Flowsheet submission page at https://om.fossee.in/flowsheeting-project/abstract-code and re-upload the flowsheet and abstract.
+You are requested to visit the Abstract and Flowsheet submission page at https://om.fossee.in/chemical/flowsheeting-project/abstract-code and re-upload the flowsheet and abstract.
 
 Best Wishes,
 
@@ -463,7 +463,7 @@ function _flowsheet_details($flowsheet_proposal_id)
 	} //$abstracts_query_process == TRUE
 	else
 	{
-		$url = l('Upload abstract', 'flowsheeting-project/abstract-code/upload');
+		$url = l('Upload abstract', 'chemical/flowsheeting-project/abstract-code/upload');
 		$unit_operations_used_in_om = "Not entered";
 		$thermodynamic_packages_used = "Not entered";
 		//$sp_filename = "File not uploaded";
@@ -483,7 +483,7 @@ function _flowsheet_details($flowsheet_proposal_id)
 		'header' => $headers,
 		'rows' => $rows
 	));
-	$download_flowsheet = l('Download flowsheet project','flowsheeting-project/full-download/project/'.$flowsheet_proposal_id);
+	$download_flowsheet = l('Download flowsheet project','chemical/flowsheeting-project/full-download/project/'.$flowsheet_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 Flowsheet Project:</strong><br />' . $abstracts_pro->project_title . '<br /><br />';
 	$return_html .= '<strong>OpenModelica version:</strong><br />' . $abstracts_pro->version . '<br /><br />';
diff --git a/flowsheet_details.inc b/flowsheet_details.inc
index 116440f..38ffdd8 100755
--- a/flowsheet_details.inc
+++ b/flowsheet_details.inc
@@ -11,12 +11,12 @@ function om_flowsheet_completed_proposals_all()
 	$result = $query->execute();
 	if ($result->rowCount() == 0)
 	{
-		$output .= "Work has been completed for the following flow sheets. We welcome your contributions. For more details, please visit ".l("https://om.fossee.in/flowsheeting-project","https://om.fossee.in/flowsheeting-project", array('attributes' => array('target' => '_blank')))."<br>"."<h4>"."If you are looking for flowsheeting project ideas, ".l("click here","https://om.fossee.in/flowsheeting-ideas",array('attributes' => array('class' => array('flash_content'), 'target' => '_blank')))."</h4>"."<hr>";
+		$output .= "Work has been completed for the following flow sheets. We welcome your contributions. For more details, please visit ".l("https://om.fossee.in/chemical/flowsheeting-project","https://om.fossee.in/chemical/flowsheeting-project", array('attributes' => array('target' => '_blank')))."<hr>";
 
 	} //$result->rowCount() == 0
 	else
 	{
-		$output .= "Work has been completed for the following flow sheets. We welcome your contributions. For more details, please visit ".l("https://om.fossee.in/flowsheeting-project","https://om.fossee.in/flowsheeting-project", array('attributes' => array('target' => '_blank')))."<br>"."<h4>"."If you are looking for flowsheeting project ideas, ".l("click here","https://om.fossee.in/flowsheeting-ideas",array('attributes' => array('class' => array('flash_content'), 'target' => '_blank')))."</h4>"."<hr>";
+		$output .= "Work has been completed for the following flow sheets. We welcome your contributions. For more details, please visit ".l("https://om.fossee.in/chemical/flowsheeting-project","https://om.fossee.in/chemical/flowsheeting-project", array('attributes' => array('target' => '_blank')))."<hr>";
 		$preference_rows = array();
 		$i = 1;
 		while ($row = $result->fetchObject())
@@ -24,7 +24,7 @@ function om_flowsheet_completed_proposals_all()
 			$completion_date = date("Y", $row->actual_completion_date);
 			$preference_rows[] = array(
 				$i,
-				l($row->project_title, "flowsheeting-project/om-flowsheet-run/" . $row->id, array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))),
+				l($row->project_title, "chemical/flowsheeting-project/om-flowsheet-run/" . $row->id, array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))),
 				$row->contributor_name,
 				$row->university,
 				$completion_date
diff --git a/full_download.inc b/full_download.inc
index 07646d6..dc8edac 100755
--- a/full_download.inc
+++ b/full_download.inc
@@ -3,7 +3,7 @@
 function om_flowsheet_download_full_project()
 {
 	global $user;
-	$flowsheet_id = arg(3);
+	$flowsheet_id = arg(4);
 	$root_path = om_flowsheet_path();
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -57,13 +57,13 @@ function om_flowsheet_download_full_project()
 	} //$zip_file_count > 0
 	else {
 		drupal_set_message("There are no flowsheet project in this proposal to download", 'error');
-		drupal_goto('flowsheeting-project/full-download/project');
+		drupal_goto('chemical/flowsheeting-project/full-download/project');
 	}
 }
 function om_flowsheet_download_completed_project()
 {
 	global $user;
-	$flowsheet_id = arg(3);
+	$flowsheet_id = arg(4);
 	$root_path = om_flowsheet_path();
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -118,6 +118,6 @@ function om_flowsheet_download_completed_project()
 	} //$zip_file_count > 0
 	else {
 		drupal_set_message("There are no flowsheet project in this proposal to download", 'error');
-		drupal_goto('flowsheeting-project/om-flowsheet-run');
+		drupal_goto('chemical/flowsheeting-project/om-flowsheet-run');
 	}
-}
+}
\ No newline at end of file
diff --git a/manage_proposal.inc b/manage_proposal.inc
index ff3026e..2cfbf19 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -16,7 +16,7 @@ function om_flowsheet_proposal_pending()
 			date('d-m-Y', $pending_data->creation_date),
 			l($pending_data->name_title . ' ' . $pending_data->contributor_name, 'user/' . $pending_data->uid),
 			$pending_data->project_title,
-			l('Approve', 'flowsheeting-project/manage-proposal/approve/' . $pending_data->id) . ' | ' . l('Edit', 'flowsheeting-project/manage-proposal/edit/' . $pending_data->id)
+			l('Approve', 'chemical/flowsheeting-project/manage-proposal/approve/' . $pending_data->id) . ' | ' . l('Edit', 'chemical/flowsheeting-project/manage-proposal/edit/' . $pending_data->id)
 		);
 	} //$pending_data = $pending_q->fetchObject()
 	/* check if there are any pending proposals */
@@ -56,7 +56,7 @@ function om_flowsheet_proposal_pending_solution()
 			l($pending_data->name, 'user/' . $pending_data->uid),
 			$pending_data->project_title,
 			$pending_data->department,
-			l('Status', 'flowsheeting-project/manage-proposal/status/' . $pending_data->id)
+			l('Status', 'chemical/flowsheeting-project/manage-proposal/status/' . $pending_data->id)
 		);
 	} //$pending_data = $pending_q->fetchObject()
 	/* check if there are any pending proposals */
@@ -123,7 +123,7 @@ function om_flowsheet_proposal_all()
 			$proposal_data->project_title,
 			$actual_completion_date,
 			$approval_status,
-			l('Status', 'flowsheeting-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'flowsheeting-project/manage-proposal/edit/' . $proposal_data->id)
+			l('Status', 'chemical/flowsheeting-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'chemical/flowsheeting-project/manage-proposal/edit/' . $proposal_data->id)
 		);
 	} //$proposal_data = $proposal_q->fetchObject()
 	/* check if there are any pending proposals */
@@ -153,7 +153,7 @@ function om_flowsheet_proposal_approval_form($form, &$form_state)
 {
 	global $user;
 	/* get current proposal */
-	$proposal_id = (int) arg(3);
+	$proposal_id = (int) arg(4);
 	//$proposal_q = db_query("SELECT * FROM {om_flowsheet_proposal} WHERE id = %d", $proposal_id);
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -168,14 +168,14 @@ function om_flowsheet_proposal_approval_form($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	}
 	if ($proposal_data->project_guide_name == "NULL" || $proposal_data->project_guide_name == "")
@@ -336,7 +336,7 @@ function om_flowsheet_proposal_approval_form($form, &$form_state)
 	);
 	$form['cancel'] = array(
 		'#type' => 'item',
-		'#markup' => l(t('Cancel'), 'flowsheeting-project/manage-proposal')
+		'#markup' => l(t('Cancel'), 'chemical/flowsheeting-project/manage-proposal')
 	);
 	return $form;
 }
@@ -354,7 +354,7 @@ function om_flowsheet_proposal_approval_form_submit($form, &$form_state)
 {
 	global $user;
 	/* get current proposal */
-	$proposal_id = (int) arg(3);
+	$proposal_id = (int) arg(4);
 	// $proposal_q = db_query("SELECT * FROM {om_flowsheet_proposal} WHERE id = %d", $proposal_id);
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -369,14 +369,14 @@ function om_flowsheet_proposal_approval_form_submit($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	}
 	if ($form_state['values']['approval'] == 1)
@@ -408,7 +408,7 @@ function om_flowsheet_proposal_approval_form_submit($form, &$form_state)
 		if (!drupal_mail('om_flowsheet', 'om_flowsheet_proposal_approved', $email_to, language_default(), $params, $from, TRUE))
 			drupal_set_message('Error sending email message.', 'error');
 		drupal_set_message('om flowsheeting proposal No. ' . $proposal_id . ' approved. User has been notified of the approval.', 'status');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	} //$form_state['values']['approval'] == 1
 	else if ($form_state['values']['approval'] == 2)
@@ -441,7 +441,7 @@ function om_flowsheet_proposal_approval_form_submit($form, &$form_state)
 		if (!drupal_mail('om_flowsheet', 'om_flowsheet_proposal_disapproved', $email_to, language_default(), $params, $from, TRUE))
 			drupal_set_message('Error sending email message.', 'error');
 		drupal_set_message('om flowsheeting proposal No. ' . $proposal_id . ' dis-approved. User has been notified of the dis-approval.', 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	} //$form_state['values']['approval'] == 2
 }
@@ -452,7 +452,7 @@ function om_flowsheet_proposal_status_form($form, &$form_state)
 {
 	global $user;
 	/* get current proposal */
-	$proposal_id = (int) arg(3);
+	$proposal_id = (int) arg(4);
 	//$proposal_q = db_query("SELECT * FROM {om_flowsheet_proposal} WHERE id = %d", $proposal_id);
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -467,14 +467,14 @@ function om_flowsheet_proposal_status_form($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	}
 	$form['contributor_name'] = array(
@@ -597,7 +597,7 @@ function om_flowsheet_proposal_status_form($form, &$form_state)
 	{
 		$form['approve'] = array(
 			'#type' => 'item',
-			'#markup' => l('Click here', 'flowsheeting-project/manage-proposal/approve/' . $proposal_id),
+			'#markup' => l('Click here', 'chemical/flowsheeting-project/manage-proposal/approve/' . $proposal_id),
 			'#title' => t('Approve')
 		);
 	} //$proposal_data->approval_status == 0
@@ -623,7 +623,7 @@ function om_flowsheet_proposal_status_form($form, &$form_state)
 	);
 	$form['cancel'] = array(
 		'#type' => 'markup',
-		'#markup' => l(t('Cancel'), 'flowsheeting-project/manage-proposal/all')
+		'#markup' => l(t('Cancel'), 'chemical/flowsheeting-project/manage-proposal/all')
 	);
 	return $form;
 }
@@ -631,7 +631,7 @@ function om_flowsheet_proposal_status_form_submit($form, &$form_state)
 {
 	global $user;
 	/* get current proposal */
-	$proposal_id = (int) arg(3);
+	$proposal_id = (int) arg(4);
 	//$proposal_q = db_query("SELECT * FROM {om_flowsheet_proposal} WHERE id = %d", $proposal_id);
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -646,14 +646,14 @@ function om_flowsheet_proposal_status_form_submit($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	}
 	/* set the book status to completed */
@@ -693,7 +693,7 @@ function om_flowsheet_proposal_status_form_submit($form, &$form_state)
 			drupal_set_message('Error sending email message.', 'error');
 		drupal_set_message('Congratulations! om flowsheeting proposal has been marked as completed. User has been notified of the completion.', 'status');
 	} //$form_state['values']['completed'] == 1
-	drupal_goto('flowsheeting-project/manage-proposal');
+	drupal_goto('chemical/flowsheeting-project/manage-proposal');
 	return;
 }
 /******************************************************************************/
@@ -703,7 +703,7 @@ function om_flowsheet_proposal_edit_form($form, &$form_state)
 {
 	global $user;
 	/* get current proposal */
-	$proposal_id = (int) arg(3);
+	$proposal_id = (int) arg(4);
 	//$proposal_q = db_query("SELECT * FROM {om_flowsheet_proposal} WHERE id = %d", $proposal_id);
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -718,14 +718,14 @@ function om_flowsheet_proposal_edit_form($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	}
 	$user_data = user_load($proposal_data->uid);
@@ -949,7 +949,7 @@ else{
 	);
 	$form['cancel'] = array(
 		'#type' => 'item',
-		'#markup' => l(t('Cancel'), 'flowsheeting-project/manage-proposal')
+		'#markup' => l(t('Cancel'), 'chemical/flowsheeting-project/manage-proposal')
 	);
 	return $form;
 }
@@ -984,7 +984,7 @@ function om_flowsheet_proposal_edit_form_submit($form, &$form_state)
 {
 	global $user;
 	/* get current proposal */
-	$proposal_id = (int) arg(3);
+	$proposal_id = (int) arg(4);
 	// $proposal_q = db_query("SELECT * FROM {om_flowsheet_proposal} WHERE id = %d", $proposal_id);
 	$query = db_select('om_flowsheet_proposal');
 	$query->fields('om_flowsheet_proposal');
@@ -999,14 +999,14 @@ function om_flowsheet_proposal_edit_form_submit($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/manage-proposal');
+		drupal_goto('chemical/flowsheeting-project/manage-proposal');
 		return;
 	}
 	/* delete proposal */
@@ -1040,7 +1040,7 @@ function om_flowsheet_proposal_edit_form_submit($form, &$form_state)
 			$query->condition('id', $proposal_id);
 			$num_deleted = $query->execute();
 			drupal_set_message(t('Proposal Deleted'), 'status');
-			drupal_goto('flowsheeting-project/manage-proposal');
+			drupal_goto('chemical/flowsheeting-project/manage-proposal');
 			return;
 		} //om_rrmdir_project($proposal_id) == TRUE
 	} //$form_state['values']['delete_proposal'] == 1
diff --git a/om_flowsheet.module b/om_flowsheet.module
index db89a0f..43214fb 100755
--- a/om_flowsheet.module
+++ b/om_flowsheet.module
@@ -10,7 +10,7 @@ function om_flowsheet_menu()
 {
 	$items = array();
 	/* PROPOSAL */
-	$items['flowsheeting-project/proposal'] = array(
+	$items['chemical/flowsheeting-project/proposal'] = array(
 		'title' => 'Flowsheet Proposal Form',
 		'description' => 'Flowsheet Proposal Form Proposal Form',
 		'page callback' => 'drupal_get_form',
@@ -23,7 +23,7 @@ function om_flowsheet_menu()
 		'type' => MENU_NORMAL_ITEM,
 		'file' => 'proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal'] = array(
 		'title' => 'Manage Flowsheet Proposals',
 		'description' => 'Manage Flowsheet Proposals',
 		'page callback' => 'om_flowsheet_proposal_pending',
@@ -33,7 +33,7 @@ function om_flowsheet_menu()
 		),
 		'file' => 'manage_proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal/pending'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal/pending'] = array(
 		'title' => 'Pending Proposals',
 		'description' => 'Pending om flowsheet Proposals Queue',
 		'page callback' => 'om_flowsheet_proposal_pending',
@@ -45,7 +45,7 @@ function om_flowsheet_menu()
 		'weight' => 1,
 		'file' => 'manage_proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal/all'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal/all'] = array(
 		'title' => 'All Proposals',
 		'description' => 'All Proposals',
 		'page callback' => 'om_flowsheet_proposal_all',
@@ -57,7 +57,7 @@ function om_flowsheet_menu()
 		'weight' => 4,
 		'file' => 'manage_proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal/approve'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal/approve'] = array(
 		'title' => 'Approve Proposal',
 		'description' => 'Approve Proposal',
 		'page callback' => 'drupal_get_form',
@@ -70,7 +70,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'manage_proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal/solution-proposal-approve'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal/solution-proposal-approve'] = array(
 		'title' => 'Approve Solution Proposal',
 		'description' => 'Approve Solution Proposal',
 		'page callback' => 'drupal_get_form',
@@ -83,7 +83,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'manage_solution_proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal/edit'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal/edit'] = array(
 		'title' => 'Edit Proposal',
 		'description' => 'Edit Proposal',
 		'page callback' => 'drupal_get_form',
@@ -96,7 +96,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'manage_proposal.inc'
 	);
-	$items['flowsheeting-project/manage-proposal/status'] = array(
+	$items['chemical/flowsheeting-project/manage-proposal/status'] = array(
 		'title' => 'Proposal Status',
 		'description' => 'Proposal Status',
 		'page callback' => 'drupal_get_form',
@@ -109,7 +109,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'manage_proposal.inc'
 	);
-	$items['flowsheeting-project/show-proposal'] = array(
+	$items['chemical/flowsheeting-project/show-proposal'] = array(
 		'title' => 'om flowsheet Solution Proposal',
 		'page callback' => 'drupal_get_form',
 		'page arguments' => array(
@@ -122,7 +122,7 @@ function om_flowsheet_menu()
 		'file' => 'solution_proposal.inc'
 	);
 	/* CODE REVIEW */
-	$items['flowsheeting-project/code-approval'] = array(
+	$items['chemical/flowsheeting-project/code-approval'] = array(
 		'title' => 'LM Manage Code Approval',
 		'description' => 'Manage Code Approval',
 		'page callback' => 'om_flowsheet_code_approval',
@@ -132,7 +132,7 @@ function om_flowsheet_menu()
 		'type' => MENU_NORMAL_ITEM,
 		'file' => 'code_approval.inc'
 	);
-	$items['flowsheeting-project/abstract-approval/approve'] = array(
+	$items['chemical/flowsheeting-project/abstract-approval/approve'] = array(
 		'title' => 'Code Approval',
 		'description' => 'Code Approval',
 		'page callback' => 'drupal_get_form',
@@ -146,7 +146,7 @@ function om_flowsheet_menu()
 		'weight' => 1,
 		'file' => 'code_approval.inc'
 	);
-	$items['flowsheeting-project/abstract-approval/bulk'] = array(
+	$items['chemical/flowsheeting-project/abstract-approval/bulk'] = array(
 		'title' => 'Bulk Manage',
 		'description' => 'Bulk Mangage',
 		'page callback' => 'drupal_get_form',
@@ -160,7 +160,7 @@ function om_flowsheet_menu()
 		'weight' => 2,
 		'file' => 'abstract_bulk_approval.inc'
 	);
-	$items['flowsheeting-project/code-approval/bulk'] = array(
+	$items['chemical/flowsheeting-project/code-approval/bulk'] = array(
 		'title' => 'Bulk Manage',
 		'description' => 'Bulk Mangage',
 		'page callback' => 'drupal_get_form',
@@ -174,7 +174,7 @@ function om_flowsheet_menu()
 		'weight' => 2,
 		'file' => 'bulk_approval.inc'
 	);
-	$items['flowsheeting-project/code-approval/upload'] = array(
+	$items['chemical/flowsheeting-project/code-approval/upload'] = array(
 		'title' => 'Upload Code',
 		'description' => 'Admin Upload',
 		'page callback' => 'drupal_get_form',
@@ -188,7 +188,7 @@ function om_flowsheet_menu()
 		'weight' => 4,
 		'file' => 'bulk_upload_code.inc'
 	);
-	$items['flowsheeting-project/code-approval/notes'] = array(
+	$items['chemical/flowsheeting-project/code-approval/notes'] = array(
 		'title' => 'Notes for Reviewers',
 		'description' => 'Notes for Reviewers',
 		'page callback' => 'drupal_get_form',
@@ -203,7 +203,7 @@ function om_flowsheet_menu()
 		'file' => 'notes.inc'
 	);
 	/* CODE UPLOAD */
-	$items['flowsheeting-project/abstract-code'] = array(
+	$items['chemical/flowsheeting-project/abstract-code'] = array(
 		'title' => 'Abstract and Flowsheet Submission',
 		'description' => 'Abstract Submission',
 		'page callback' => 'om_flowsheet_abstract',
@@ -213,7 +213,7 @@ function om_flowsheet_menu()
 		),
 		'file' => 'upload_code.inc'
 	);
-	$items['flowsheeting-project/abstract-code/flowsheet-project-list'] = array(
+	$items['chemical/flowsheeting-project/abstract-code/flowsheet-project-list'] = array(
 		'title' => 'Flowsheet project',
 		'description' => 'List Experiments',
 		'page callback' => 'om_flowsheet_abstract',
@@ -224,7 +224,7 @@ function om_flowsheet_menu()
 		'file' => 'upload_code.inc',
 		'weight' => 1
 	);
-	$items['flowsheeting-project/abstract-code/upload'] = array(
+	$items['chemical/flowsheeting-project/abstract-code/upload'] = array(
 		'title' => 'Abstract and Flowsheet Submission',
 		'description' => 'Abstract Submission',
 		'page callback' => 'drupal_get_form',
@@ -238,7 +238,7 @@ function om_flowsheet_menu()
 		'file' => 'upload_code.inc',
 		'weight' => 2
 	);
-	$items['flowsheeting-project/abstract-code/delete'] = array(
+	$items['chemical/flowsheeting-project/abstract-code/delete'] = array(
 		'title' => 'Delete Solution',
 		'description' => 'Delete Solution',
 		'page callback' => 'om_flowsheet_upload_code_delete',
@@ -249,7 +249,7 @@ function om_flowsheet_menu()
 		'file' => 'upload_code_delete.inc'
 	);
 	/* CODE DOWNLOADS */
-	$items['flowsheeting-project/download/file'] = array(
+	$items['chemical/flowsheeting-project/download/file'] = array(
 		'title' => 'Code Download',
 		'description' => 'Code Download',
 		'page callback' => 'om_flowsheet_download_solution_file',
@@ -259,7 +259,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'download.inc'
 	);
-	$items['flowsheeting-project/download/solution'] = array(
+	$items['chemical/flowsheeting-project/download/solution'] = array(
 		'title' => 'Code Download',
 		'description' => 'Code Download',
 		'page callback' => 'om_flowsheet_download_solution',
@@ -269,7 +269,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'download.inc'
 	);
-	$items['flowsheeting-project/download/experiment'] = array(
+	$items['chemical/flowsheeting-project/download/experiment'] = array(
 		'title' => 'Code Download',
 		'description' => 'Code Download',
 		'page callback' => 'om_flowsheet_download_experiment',
@@ -279,7 +279,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'download.inc'
 	);
-	$items['flowsheeting-project/download/lab'] = array(
+	$items['chemical/flowsheeting-project/download/lab'] = array(
 		'title' => 'Code Download',
 		'description' => 'Code Download',
 		'page callback' => 'om_flowsheet_download_lab',
@@ -289,7 +289,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'download.inc'
 	);
-	$items['flowsheeting-project/full-download/experiment'] = array(
+	$items['chemical/flowsheeting-project/full-download/experiment'] = array(
 		'title' => 'Code Download',
 		'description' => 'Code Download',
 		'page callback' => 'om_flowsheet_download_full_experiment',
@@ -299,7 +299,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'full_download.inc'
 	);
-	$items['flowsheeting-project/full-download/project'] = array(
+	$items['chemical/flowsheeting-project/full-download/project'] = array(
 		'title' => 'Code Download',
 		'description' => 'Code Download',
 		'page callback' => 'om_flowsheet_download_full_project',
@@ -310,7 +310,7 @@ function om_flowsheet_menu()
 		'file' => 'full_download.inc'
 	);
 	/* COMPLETED om flowsheetS */
-	$items['flowsheeting-project/completed-flowsheet'] = array(
+	$items['chemical/flowsheeting-project/completed-flowsheet'] = array(
 		'title' => 'Completed Flowsheets',
 		'page callback' => 'om_flowsheet_completed_proposals_all',
 		'access arguments' => array(
@@ -319,7 +319,7 @@ function om_flowsheet_menu()
 		'file' => 'flowsheet_details.inc'
 	);
 	/* LABS IN PROGRESS */
-	$items['flowsheeting-project/flowsheet-progress'] = array(
+	$items['chemical/flowsheeting-project/flowsheet-progress'] = array(
 		'title' => 'Flowsheets in Progress',
 		'page callback' => 'om_flowsheet_progress_all',
 		'access arguments' => array(
@@ -328,7 +328,7 @@ function om_flowsheet_menu()
 		'file' => 'flowsheet_details.inc'
 	);
 	/* DOWNLOAD FOR EVERYONE */
-	$items['flowsheeting-project/om-flowsheet-run'] = array(
+	$items['chemical/flowsheeting-project/om-flowsheet-run'] = array(
 		'title' => 'Download Codes',
 		'page callback' => 'drupal_get_form',
 		'page arguments' => array(
@@ -340,7 +340,7 @@ function om_flowsheet_menu()
 		'type' => MENU_NORMAL_ITEM,
 		'file' => 'run.inc'
 	);
-	$items['flowsheeting-project/download/user-defined-compound-file'] = array(
+	$items['chemical/flowsheeting-project/download/user-defined-compound-file'] = array(
 		'title' => 'Download user defined compound file',
 		'description' => 'Download user defined compound',
 		'page callback' => 'om_flowsheet_download_user_defined_compound',
@@ -351,7 +351,7 @@ function om_flowsheet_menu()
 		'file' => 'download.inc'
 	);
 	/* LATEX SCRIPT */
-	$items['flowsheeting-project/generate-lab'] = array(
+	$items['chemical/flowsheeting-project/generate-lab'] = array(
 		'title' => 'Generate Lab',
 		'description' => 'Generate Lab From Latex Script',
 		'page callback' => 'om_flowsheet_download_lab_pdf',
@@ -361,7 +361,7 @@ function om_flowsheet_menu()
 		'type' => MENU_CALLBACK,
 		'file' => 'latex.inc'
 	);
-	$items['flowsheeting-project/delete-lab'] = array(
+	$items['chemical/flowsheeting-project/delete-lab'] = array(
 		'title' => 'Delete Lab PDF',
 		'description' => 'Delete Lab PDF',
 		'page callback' => 'om_flowsheet_delete_lab_pdf',
@@ -395,7 +395,7 @@ function om_flowsheet_menu()
 		"type" => MENU_CALLBACK,
 		'file' => 'bulk_approval.inc'
 	);
-	$items['flowsheeting-project/certificates'] = array(
+	$items['chemical/flowsheeting-project/certificates'] = array(
 		'title' => 'List of Flowsheet Certificates',
 		'description' => 'List of flowsheet Certificates',
 		'page callback' => '_list_flowsheet_certificates',
@@ -404,7 +404,7 @@ function om_flowsheet_menu()
 		),
 		'file' => 'pdf/list_flowsheet_certificate.inc'
 	);
-	$items['flowsheeting-project/certificates/generate-pdf'] = array(
+	$items['chemical/flowsheeting-project/certificates/generate-pdf'] = array(
 		'title' => 'Download Certificate',
 		'description' => 'Download Certificate',
 		'page callback' => 'drupal_get_form',
@@ -417,7 +417,7 @@ function om_flowsheet_menu()
 		),
 		'file' => 'pdf/cert_new.inc'
 	);
-	$items['flowsheeting-project/certificates-custom'] = array(
+	$items['chemical/flowsheeting-project/certificates-custom'] = array(
 		'title' => 'List of Flowsheet Custom Certificates',
 		'description' => 'List of flowsheet Custom Certificates',
 		'page callback' => '_list_flowsheet_custom_certificates',
@@ -426,7 +426,7 @@ function om_flowsheet_menu()
 		),
 		'file' => 'pdf/list_mentor_certificates.inc'
 	);
-	$items['flowsheeting-project/certificates-custom/pdf'] = array(
+	$items['chemical/flowsheeting-project/certificates-custom/pdf'] = array(
 		'title' => 'Download Certificate',
 		'description' => 'Download Certificate',
 		'page callback' => 'drupal_get_form',
@@ -439,7 +439,7 @@ function om_flowsheet_menu()
 		),
 		'file' => 'pdf/mentor_cert_pdf.inc'
 	);
-	$items["flowsheeting-project/certificates/verify"] = array(
+	$items["chemical/flowsheeting-project/certificates/verify"] = array(
 		"title" => "Certificate Verification",
 		"page callback" => "verify_certificates",
 		"access arguments" => array(
@@ -519,10 +519,10 @@ function om_flowsheet_permission()
 	);
 	// return array('om flowsheet create proposal', 'om flowsheet manage proposal', 'om flowsheet edit proposal', 'om flowsheet approve proposal', 'om flowsheet propose solution', 'om flowsheet approve code', 'om flowsheet bulk manage abstract', 'om flowsheet bulk delete code', 'om flowsheet upload code', 'om flowsheet download code', 'administer om flowsheet', 'om flowsheet generate lab');
 }
-/* AJAX CALLS */
+/* AJAX CALLS 
 function om_flowsheet_ajax()
 {
-	$query_type = arg(2);
+	$query_type = arg(3);
 	if ($query_type == 'chapter_title')
 	{
 		$chapter_number = arg(3);
diff --git a/pdf/cert_new.inc b/pdf/cert_new.inc
index 9b048d1..1202d92 100755
--- a/pdf/cert_new.inc
+++ b/pdf/cert_new.inc
@@ -6,7 +6,7 @@ function generate_pdf()
 	require($mpath.'/pdf/phpqrcode/qrlib.php');
 	global $user;
 	$x                 = $user->uid;
-	$proposal_id       = arg(3);
+	$proposal_id       = arg(4);
 	$query3 = db_query("SELECT * FROM om_flowsheet_proposal WHERE approval_status=3 AND uid= :uid AND id=:proposal_id", array(
 		':uid' => $user->uid,
 		':proposal_id'=>$proposal_id
@@ -237,7 +237,7 @@ function generate_copyright_form_pdf()
 	require($mpath . '/pdf/fpdf/fpdf.php');
 	global $user;
 	$x           = $user->uid;
-	$proposal_id = arg(3);
+	$proposal_id = arg(4);
 	$query2 = db_query("SELECT id FROM om_flowsheet_proposal WHERE approval_status=3 AND uid= :uid", array(
 		':uid' => $user->uid
 	));
@@ -325,7 +325,7 @@ function generate_undertaking_form_pdf()
 	require($mpath . '/pdf/fpdf/fpdf.php');
 	global $user;
 	$x           = $user->uid;
-	$proposal_id = arg(3);
+	$proposal_id = arg(4);
 	$query2 = db_query("SELECT id FROM om_flowsheet_proposal WHERE approval_status=3 AND uid= :uid", array(
 		':uid' => $user->uid
 	));
diff --git a/pdf/verify_certificates.inc b/pdf/verify_certificates.inc
index eb4d7d1..9f3fb32 100755
--- a/pdf/verify_certificates.inc
+++ b/pdf/verify_certificates.inc
@@ -1,7 +1,7 @@
 <?php
 function verify_certificates($qr_code = 0)
 {
-	$qr_code = arg(3);
+	$qr_code = arg(4);
 	$page_content = "";
 	if ($qr_code)
 	{
diff --git a/run.inc b/run.inc
index 49c218b..842751f 100755
--- a/run.inc
+++ b/run.inc
@@ -2,7 +2,7 @@
 function om_flowsheet_run_form($form, &$form_state)
 {
 	$options_first = _list_of_flowsheet();
-	$url_flowsheet_id = (int) arg(2);
+	$url_flowsheet_id = (int) arg(3);
 	$flowsheet_data = _flowsheet_information($url_flowsheet_id);
 	if ($flowsheet_data == 'Not found') {
 		$url_flowsheet_id = '';
@@ -44,7 +44,7 @@ function om_flowsheet_run_form($form, &$form_state)
 		);
 		$form['selected_flowsheet'] = array(
 			'#type' => 'item',
-			'#markup' => '<div id="ajax_selected_flowsheet">' . l('Download Flowsheet', 'flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))) . '</div>'
+			'#markup' => '<div id="ajax_selected_flowsheet">' . l('Download Flowsheet', 'chemical/flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))) . '</div>'
 		);
 	}
 	return $form;
@@ -58,7 +58,7 @@ function om_flowsheet_project_details_callback($form, $form_state)
 		$flowsheet_details = _flowsheet_information($flowsheet_default_value);
 		$provider = user_load($flowsheet_details->uid);
 		if ($flowsheet_details->uid > 0) {
-			$commands[] = ajax_command_html('#ajax_selected_flowsheet', l('Download Flowsheet', 'flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))));
+			$commands[] = ajax_command_html('#ajax_selected_flowsheet', l('Download Flowsheet', 'chemical/flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))));
 		} //$flowsheet_details->uid > 0
 		else {
 			$commands[] = ajax_command_html('#ajax_selected_flowsheet', '');
@@ -137,8 +137,8 @@ function _flowsheet_details($flowsheet_default_value)
 {
 	$flowsheet_details = _flowsheet_information($flowsheet_default_value);
 	if ($flowsheet_default_value != 0) {
-		$form['flowsheet_details']['#markup'] = '<span style="color: rgb(128, 0, 0);"><strong>About the Flowsheet</strong></span></td><td style="width: 35%;"><br />' . '<ul>' . '<li><strong>Proposer Name:</strong> ' . $flowsheet_details->name_title . ' ' . $flowsheet_details->contributor_name . '</li>' . '<li><strong>Title of the Flowhseet:</strong> ' . l($flowsheet_details->project_title,'flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))) . '</li>' . '<li><strong>Institution:</strong> ' . $flowsheet_details->university . '</li>' . '<li><strong>Version:</strong> ' . $flowsheet_details->version . '</li>' . '<li><strong>Reference:</strong> ' . $flowsheet_details->reference . '</li>' . '</ul>';
+		$form['flowsheet_details']['#markup'] = '<span style="color: rgb(128, 0, 0);"><strong>About the Flowsheet</strong></span></td><td style="width: 35%;"><br />' . '<ul>' . '<li><strong>Proposer Name:</strong> ' . $flowsheet_details->name_title . ' ' . $flowsheet_details->contributor_name . '</li>' . '<li><strong>Title of the Flowhseet:</strong> ' . l($flowsheet_details->project_title,'chemical/flowsheeting-project/full-download/project/' . $flowsheet_default_value,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the om flow sheet which is to be viewed by right clicking on the file and opening with om.'))) . '</li>' . '<li><strong>Institution:</strong> ' . $flowsheet_details->university . '</li>' . '<li><strong>Version:</strong> ' . $flowsheet_details->version . '</li>' . '<li><strong>Reference:</strong> ' . $flowsheet_details->reference . '</li>' . '</ul>';
 		$details = $form['flowsheet_details']['#markup'];
 		return $details;
 	} //$flowsheet_default_value != 0
-}
+}
\ No newline at end of file
diff --git a/upload_code.inc b/upload_code.inc
index a58be67..3970b90 100755
--- a/upload_code.inc
+++ b/upload_code.inc
@@ -86,7 +86,7 @@ function om_flowsheet_abstract()
 		}
 		if ($abstracts_q->is_submitted == '')
 		{
-			$url = l('Upload abstract', 'flowsheeting-project/abstract-code/upload');
+			$url = l('Upload abstract', 'chemical/flowsheeting-project/abstract-code/upload');
 		} //$abstracts_q->is_submitted == ''
 		else if ($abstracts_q->is_submitted == 1)
 		{
@@ -94,7 +94,7 @@ function om_flowsheet_abstract()
 		} //$abstracts_q->is_submitted == 1
 		else if ($abstracts_q->is_submitted == 0)
 		{
-			$url = l('Edit abstract', 'flowsheeting-project/abstract-code/upload');
+			$url = l('Edit abstract', 'chemical/flowsheeting-project/abstract-code/upload');
 		} //$abstracts_q->is_submitted == 0
 		if ($abstracts_q->unit_operations_used_in_om == '')
 		{
@@ -116,7 +116,7 @@ function om_flowsheet_abstract()
 	} //$abstracts_query_process == TRUE
 	else
 	{
-		$url = l('Upload abstract', 'flowsheeting-project/abstract-code/upload');
+		$url = l('Upload abstract', 'chemical/flowsheeting-project/abstract-code/upload');
 		$unit_operations_used_in_om = "Not entered";
 		$thermodynamic_packages_used = "Not entered";
 		$abstracts_query_process_filename = "File not uploaded";
@@ -173,14 +173,14 @@ function om_flowsheet_upload_abstract_code_form($form, &$form_state)
 		else
 		{
 			drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-			drupal_goto('flowsheeting-project/abstract-code');
+			drupal_goto('chemical/flowsheeting-project/abstract-code');
 			return;
 		}
 	} //$proposal_q
 	else
 	{
 		drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
-		drupal_goto('flowsheeting-project/abstract-code');
+		drupal_goto('chemical/flowsheeting-project/abstract-code');
 		return;
 	}
 	$query = db_select('om_flowsheet_submitted_abstracts');
@@ -192,7 +192,7 @@ function om_flowsheet_upload_abstract_code_form($form, &$form_state)
 		if ($abstracts_q->is_submitted == 1)
 		{
 			drupal_set_message(t('Your abstract is under review, you can not edit exisiting abstract without reviewer permission.'), 'error', $repeat = FALSE);
-			drupal_goto('flowsheeting-project/abstract-code');
+			drupal_goto('chemical/flowsheeting-project/abstract-code');
 			//return;
 		} //$abstracts_q->is_submitted == 1
 	} //$abstracts_q->is_submitted == 1
@@ -331,7 +331,7 @@ function om_flowsheet_upload_abstract_code_form($form, &$form_state)
 	);
 	$form['cancel'] = array(
 		'#type' => 'item',
-		'#markup' => l(t('Cancel'), 'flowsheeting-project/manage-proposal')
+		'#markup' => l(t('Cancel'), 'chemical/flowsheeting-project/manage-proposal')
 	);
 	return $form;
 }
@@ -746,7 +746,7 @@ function om_flowsheet_upload_abstract_code_form_submit($form, &$form_state)
 	);
 	if (!drupal_mail('om_flowsheet', 'abstract_uploaded', $email_to, language_default(), $params, $from, TRUE))
 		drupal_set_message('Error sending email message.', 'error');
-	drupal_goto('flowsheeting-project/abstract-code');
+	drupal_goto('chemical/flowsheeting-project/abstract-code');
 }
 function default_value_for_selections($opration, $proposal_id)
 {