Merge pull request #7 from Sashi20/master

Modify project title column in completed projects page

4 files changed, 20 insertions, 20 deletions

diff --git a/custom_model.module b/custom_model.module
index 99291ff..9b363f4 100755
--- a/custom_model.module
+++ b/custom_model.module
@@ -416,12 +416,12 @@ function custom_model_menu()
         "type" => MENU_CALLBACK,
         'file' => 'bulk_approval.inc'
     );
-    $items['custom-model/certificates'] = array(
+    /*$items['custom-model/certificates'] = array(
         'title' => 'List of Custom Model Certificates',
-        'description' => 'List of circuit simulation Certificates',
+        'description' => 'List of Custom Model Certificates',
         'page callback' => '_list_custom_model_certificates',
         'access arguments' => array(
-            'list circuit simulation certificates'
+            'list custom model certificates'
         ),
         'file' => 'pdf/list_custom_model_certificate.inc'
     );
@@ -437,8 +437,8 @@ function custom_model_menu()
             'generate pdf'
         ),
         'file' => 'pdf/cert_new.inc'
-    );
-    $items['custom-model/certificates-custom'] = array(
+    );*/
+    /*$items['custom-model/certificates-custom'] = array(
         'title' => 'List of Custom Model Custom Certificates',
         'description' => 'List of circuit simulation Custom Certificates',
         'page callback' => '_list_custom_model_custom_certificates',
@@ -459,8 +459,8 @@ function custom_model_menu()
             'generate pdf'
         ),
         'file' => 'pdf/mentor_cert_pdf.inc'
-    );
-    $items['custom-model/certificates/verify'] = array(
+    );*/
+    /*$items['custom-model/certificates/verify'] = array(
         "title" => "Certificate Verification",
         "page callback" => "verify_certificates",
 'page arguments' => array(
@@ -471,7 +471,7 @@ function custom_model_menu()
         ),
         'type' => MENU_CALLBACK,
         'file' => 'pdf/verify_certificates.inc'
-    );
+    );*/
     return $items;
 }
 /**
@@ -540,16 +540,16 @@ function custom_model_permission()
             'title' => t('custom model generate abstract'),
             'restrict access' => TRUE
         ),
-        "list circuit simulation certificates" => array(
+        "list custom model certificates" => array(
             "title" => t("list the certificates"),
             "description" => t("list the certificates"),
             'restrict access' => TRUE
         ),
-        "list circuit simulation custom certificates" => array(
+        /*"list circuit simulation custom certificates" => array(
             "title" => t("list the mentor certificates"),
             "description" => t("list the mentor certificates"),
             'restrict access' => TRUE
-        ),
+        ),*/
         "verify certificates" => array(
             "title" => t("verify the certificates"),
             "description" => t("verify the certificates"),
diff --git a/custom_model_details.inc b/custom_model_details.inc
index 893e0d7..2860d2a 100755
--- a/custom_model_details.inc
+++ b/custom_model_details.inc
@@ -26,7 +26,7 @@ function custom_model_completed_proposals_all()
 			$completion_date = date("Y", $row->actual_completion_date);
 			$preference_rows[] = array(
 				$i,
-				l($row->project_title, "custom-model/custom-model-run/" . $row->id),
+				l($row->project_title, "custom-model/custom-model-run/" . $row->id) . t("<br><strong>(Script used: ") . $row->script_used . t(")</strong>"),
 				$row->contributor_name,
 				$row->university,
 				$completion_date
diff --git a/email.inc b/email.inc
index a519456..fe40b3f 100755
--- a/email.inc
+++ b/email.inc
@@ -18,7 +18,7 @@ function custom_model_mail($key, &$message, $params)
 			$proposal_data = $query->execute()->fetchObject();
 			$user = user_load($params['custom_model_proposal_received']['user_id']);
 			$message['headers'] = $params['custom_model_proposal_received']['headers'];
-			$message['subject'] = t('[!site_name][DWSIM Custom Model] Your DWSIM Custom Model proposal has been received', array(
+			$message['subject'] = t('[!site_name][Custom Model] Your DWSIM Custom Model proposal has been received', array(
 				'!site_name' => variable_get('site_name', '')
 			), array(
 				'language' => $language->language
@@ -61,7 +61,7 @@ FOSSEE, IIT Bombay', array(
 			$proposal_data = $query->execute()->fetchObject();
 			$user_data = user_load($params['custom_model_proposal_approved']['user_id']);
 			$message['headers'] = $params['custom_model_proposal_approved']['headers'];
-			$message['subject'] = t('[!site_name][DWSIM Custom Model] Your DWSIM Custom Model proposal has been approved', array(
+			$message['subject'] = t('[!site_name][Custom Model] Your DWSIM Custom Model proposal has been approved', array(
 				'!site_name' => variable_get('site_name', '')
 			), array(
 				'language' => $language->language
@@ -103,7 +103,7 @@ FOSSEE, IIT Bombay', array(
 			$user_data = user_load($params['custom_model_proposal_disapproved']['user_id']);
 			//$user = user_load($params['custom_model_proposal']['name']);
 			$message['headers'] = $params['custom_model_proposal_disapproved']['headers'];
-			$message['subject'] = t('[!site_name][DWSIM Custom Model] Your DWSIM Custom Model proposal has been disapproved', array(
+			$message['subject'] = t('[!site_name][Custom Model] Your DWSIM Custom Model proposal has been disapproved', array(
 				'!site_name' => variable_get('site_name', '')
 			), array(
 				'language' => $language->language
@@ -150,7 +150,7 @@ FOSSEE, IIT Bombay', array(
 			$proposal_data = $query->execute()->fetchObject();
 			$user_data = user_load($params['custom_model_proposal_completed']['user_id']);
 			$message['headers'] = $params['custom_model_proposal_completed']['headers'];
-			$message['subject'] = t('[!site_name][DWSIM Custom Model] Your DWSIM Custom Model proposal has been completed', array(
+			$message['subject'] = t('[!site_name][Custom Model] Your DWSIM Custom Model proposal has been completed', array(
 				'!site_name' => variable_get('site_name', '')
 			), array(
 				'language' => $language->language
@@ -190,7 +190,7 @@ FOSSEE, IIT Bombay', array(
 			$proposal_data = $query->execute()->fetchObject();
 			$user_data = user_load($params['custom_model_proposal_deleted']['user_id']);
 			$message['headers'] = $params['custom_model_proposal_deleted']['headers'];
-			$message['subject'] = t('[!site_name][DWSIM Custom Model] Your DWSIM Custom Model proposal has been deleted', array(
+			$message['subject'] = t('[!site_name][Custom Model] Your DWSIM Custom Model proposal has been deleted', array(
 				'!site_name' => variable_get('site_name', '')
 			), array(
 				'language' => $language->language
@@ -231,7 +231,7 @@ FOSSEE, IIT Bombay', array(
 			$query->range(0, 1);
 			$proposal_data = $query->execute()->fetchObject();
 			$user = user_load($params['abstract_uploaded']['user_id']);
-			$message['subject'] = t('[!site_name][DWSIM Custom Model] You have uploaded DWSIM Custom Model project files', array(
+			$message['subject'] = t('[!site_name][Custom Model] You have uploaded DWSIM Custom Model project files', array(
 				'!site_name' => variable_get('site_name', '')
 			), array(
 				'language' => $language->language
diff --git a/proposal.inc b/proposal.inc
index 94d58e4..1d310d4 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -30,8 +30,8 @@ function custom_model_proposal_form($form, &$form_state, $no_js_use = FALSE)
 	/************************ start approve book details ************************/
 	if ($user->uid == 0)
 	{
-		$msg = drupal_set_message(t('It is mandatory to ' . l('login', 'user') . ' on this website to access the custom model proposal form. If you are new user please create a new account first.'), 'error');
-		drupal_goto('user');
+		$msg = drupal_set_message(t('It is mandatory to login on this website to access the custom model proposal form. If you are new user please create a new account first.'), 'error');
+		drupal_goto('user/login', array('query' => drupal_get_destination()));
 		return $msg;
 	} //$user->uid == 0
 	$query = db_select('custom_model_proposal');