diff options
| -rwxr-xr-x | cfd_case_study_details.inc | 9 | ||||
| -rwxr-xr-x | run.inc | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/cfd_case_study_details.inc b/cfd_case_study_details.inc index c9c6099..22beab8 100755 --- a/cfd_case_study_details.inc +++ b/cfd_case_study_details.inc @@ -32,12 +32,11 @@ function cfd_case_study_completed_proposals_all() $case_study_abstract = $case_study_files->fetchObject(); $project_title = l($row->project_title, "case-study-project/case-study-run/" . $row->id); $year = date("Y", $row->actual_completion_date); - $solver_used = WordWrap($row->solver_used,10,"\n",true); + $solver_used = $row->solver_used; $preference_rows[] = array( $i, $project_title, $solver_used, - l('Download', "case-study-project/download/project-file/" . $row->id), $row->contributor_name, $row->university, $year @@ -48,11 +47,9 @@ function cfd_case_study_completed_proposals_all() 'No', 'Case Study Project', 'Solver used', - 'Abstract File', 'Contributor Name', - 'Institute/ University', - //'Institute', - 'Year' + 'University/ Institute', + 'Year of Completion' ); $output .= theme('table', array( 'header' => $preference_header, @@ -44,7 +44,7 @@ function cfd_case_study_run_form($form, &$form_state) ); $form['selected_case_study'] = array( '#type' => 'item', - '#markup' => '<div id="ajax_selected_case_study">' . l('Download Case Study', 'case-study-project/full-download/project/' . $case_study_default_value) . '</div>' + '#markup' => '<div id="ajax_selected_case_study">' . l('Download Abstract', "case-study-project/download/project-file/" . $case_study_default_value) . '<br>' . l('Download Case Study', 'case-study-project/full-download/project/' . $case_study_default_value) . '</div>' ); } return $form; @@ -58,7 +58,7 @@ function case_study_project_details_callback($form, $form_state) $case_study_details = _case_study_information($case_study_default_value); $provider = user_load($case_study_details->uid); if ($case_study_details->uid > 0) { - $commands[] = ajax_command_html('#ajax_selected_case_study', l('Download case study', 'case-study-project/full-download/project/' . $case_study_default_value)); + $commands[] = ajax_command_html('#ajax_selected_case_study', l('Download Abstract', "case-study-project/download/project-file/" . $case_study_default_value) . '<br>' . l('Download case study', 'case-study-project/full-download/project/' . $case_study_default_value)); } //$case_study_details->uid > 0 else { $commands[] = ajax_command_html('#ajax_selected_case_study', ''); |