summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprashantsinalkar2017-04-07 11:41:41 +0530
committerprashantsinalkar2017-04-07 11:41:41 +0530
commit850a5fe5adb2d5c38ea4356bb61bf5fa4a912421 (patch)
tree21711792f7dd4d29f1aa1a11640670f4d38e05cc
parentef1ed8a0a9d393daab5f1fe96ae420c617494a41 (diff)
downloaddwsim_flowsheet-850a5fe5adb2d5c38ea4356bb61bf5fa4a912421.tar.gz
dwsim_flowsheet-850a5fe5adb2d5c38ea4356bb61bf5fa4a912421.tar.bz2
dwsim_flowsheet-850a5fe5adb2d5c38ea4356bb61bf5fa4a912421.zip
done some minor changes
-rwxr-xr-xdwsim_flowsheet.module4
-rwxr-xr-xflowsheet_details.inc6
-rwxr-xr-xrun.inc6
3 files changed, 8 insertions, 8 deletions
diff --git a/dwsim_flowsheet.module b/dwsim_flowsheet.module
index 49067e6..4636471 100755
--- a/dwsim_flowsheet.module
+++ b/dwsim_flowsheet.module
@@ -331,14 +331,14 @@ function dwsim_flowsheet_menu()
'description' => 'Code Download',
'page callback' => 'dwsim_flowsheet_download_full_project',
'access arguments' => array(
- 'dwsim flowsheet approve code'
+ 'dwsim flowsheet download code'
),
'type' => MENU_CALLBACK,
'file' => 'full_download.inc'
);
/* COMPLETED dwsim flowsheetS */
$items['flowsheeting-project/completed-flowsheet'] = array(
- 'title' => 'Completed Flowsheet',
+ 'title' => 'Completed Flowsheets',
'page callback' => 'dwsim_flowsheet_completed_proposals_all',
'access arguments' => array(
'dwsim flowsheet download code'
diff --git a/flowsheet_details.inc b/flowsheet_details.inc
index 61f6968..0253943 100755
--- a/flowsheet_details.inc
+++ b/flowsheet_details.inc
@@ -10,11 +10,11 @@ function dwsim_flowsheet_completed_proposals_all()
$result = $query->execute();
if ($result->rowCount() == 0)
{
- $output .= "Work has been completed for the following flowsheets under Flowsheeting Project<hr>";
+ $output .= "Work has been completed for the following flow sheets. We welcome your contributions. For more details, please visit ".l("http://dwsim.fossee.in/flowsheeting-project","http://dwsim.fossee.in/flowsheeting-project")."<hr>";
} //$result->rowCount() == 0
else
{
- $output .= "Work has been completed for the following flowsheets under Flowsheeting Project <hr>";
+ $output .= "Work has been completed for the following flow sheets. We welcome your contributions. For more details, please visit ".l("http://dwsim.fossee.in/flowsheeting-project","http://dwsim.fossee.in/flowsheeting-project")."<hr>";
$preference_rows = array();
$i = 1;
while ($row = $result->fetchObject())
@@ -22,7 +22,7 @@ function dwsim_flowsheet_completed_proposals_all()
$approval_date = date("Y", $row->approval_date);
$preference_rows[] = array(
$i,
- l($row->project_title, "flowsheeting-project/dwsim-flowsheet-run/" . $row->id),
+ l($row->project_title, "flowsheeting-project/dwsim-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 DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))),
$row->university,
$approval_date
);
diff --git a/run.inc b/run.inc
index 2b38df7..3741099 100755
--- a/run.inc
+++ b/run.inc
@@ -44,7 +44,7 @@ function dwsim_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) . '</div>'
+ '#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 DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))) . '</div>'
);
}
return $form;
@@ -58,7 +58,7 @@ function dwsim_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));
+ $commands[] = ajax_command_html('#ajax_selected_flowsheet', l('Download Flowsheet', 'flowsheeting-project/full-download/project/' . $flowsheet_default_valuei,array('attributes' => array('title' => 'This is a zip file containing a pdf (abstract) and a dwxml/dwxmz file which is the DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))));
} //$flowsheet_details->uid > 0
else {
$commands[] = ajax_command_html('#ajax_selected_flowsheet', '');
@@ -137,7 +137,7 @@ 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> ' . $flowsheet_details->project_title . '</li>' . '<li><strong>University:</strong> ' . $flowsheet_details->university . '</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,'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 DWSIM flow sheet which is to be viewed by right clicking on the file and opening with DWSIM.'))) . '</li>' . '<li><strong>University:</strong> ' . $flowsheet_details->university . '</li>' . '</ul>';
$details = $form['flowsheet_details']['#markup'];
return $details;
} //$flowsheet_default_value != 0