diff options
author | Prashant P Shah | 2012-06-21 22:35:39 +0530 |
---|---|---|
committer | Prashant P Shah | 2012-06-21 22:35:39 +0530 |
commit | 8229e6c09b9b21d65a929a48ea35f962b3dc07b9 (patch) | |
tree | e93d0c0230a05436abfff0e32236899be9a8edab | |
parent | 1c4c0e21a1dec6854a855138e876625c34c79650 (diff) | |
download | scilab_lab_migration-8229e6c09b9b21d65a929a48ea35f962b3dc07b9.tar.gz scilab_lab_migration-8229e6c09b9b21d65a929a48ea35f962b3dc07b9.tar.bz2 scilab_lab_migration-8229e6c09b9b21d65a929a48ea35f962b3dc07b9.zip |
fixed formatting issues
Signed-off-by: Prashant P Shah <pshah.mumbai@gmail.com>
-rwxr-xr-x | bulk_upload_code.inc | 70 | ||||
-rwxr-xr-x | dependency.inc | 20 | ||||
-rwxr-xr-x | manage_proposal.inc | 6 | ||||
-rwxr-xr-x | manage_solution_proposal.inc | 10 | ||||
-rwxr-xr-x | run.inc | 38 |
5 files changed, 72 insertions, 72 deletions
diff --git a/bulk_upload_code.inc b/bulk_upload_code.inc index 329f8ff..38e1460 100755 --- a/bulk_upload_code.inc +++ b/bulk_upload_code.inc @@ -99,11 +99,11 @@ function lab_migration_bulk_upload_code_form($form_state) '#collapsed' => FALSE, ); $form['sourcefile']['sourcefile1'] = array( - '#type' => 'file', - '#title' => t('Upload main or source file'), - '#size' => 48, - '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . - t('Allowed file extensions : ') . variable_get('lab_migration_source_extensions', ''), + '#type' => 'file', + '#title' => t('Upload main or source file'), + '#size' => 48, + '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . + t('Allowed file extensions : ') . variable_get('lab_migration_source_extensions', ''), ); $form['dep_files'] = array( @@ -132,23 +132,23 @@ function lab_migration_bulk_upload_code_form($form_state) ); $form['existing_depfile']['dep_lab_title'] = array( - '#type' => 'select', - '#title' => t('Title of the Lab'), - '#options' => _list_of_lab_titles(), + '#type' => 'select', + '#title' => t('Title of the Lab'), + '#options' => _list_of_lab_titles(), ); list($files_options, $files_options_class) = _list_of_dependency_files(); $form['existing_depfile']['dep_experiment_files'] = array( - '#type' => 'checkboxes', - '#title' => t('Dependency Files'), - '#options' => $files_options, - '#options_class' => $files_options_class, - '#multiple' => TRUE, + '#type' => 'checkboxes', + '#title' => t('Dependency Files'), + '#options' => $files_options, + '#options_class' => $files_options_class, + '#multiple' => TRUE, ); $form['existing_depfile']['dep_upload'] = array( - '#type' => 'item', - '#value' => l('Upload New Depedency Files', 'lab_migration/code/upload_dep'), + '#type' => 'item', + '#value' => l('Upload New Depedency Files', 'lab_migration/code/upload_dep'), ); /************ END OF EXISTING DEPENDENCIES **************/ @@ -159,18 +159,18 @@ function lab_migration_bulk_upload_code_form($form_state) '#collapsed' => FALSE, ); $form['result']['result1'] = array( - '#type' => 'file', - '#title' => t('Upload result file'), - '#size' => 48, - '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . - t('Allowed file extensions : ') . variable_get('lab_migration_result_extensions', ''), + '#type' => 'file', + '#title' => t('Upload result file'), + '#size' => 48, + '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . + t('Allowed file extensions : ') . variable_get('lab_migration_result_extensions', ''), ); $form['result']['result2'] = array( - '#type' => 'file', - '#title' => t('Upload result file'), - '#size' => 48, - '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . - t('Allowed file extensions : ') . variable_get('lab_migration_result_extensions', ''), + '#type' => 'file', + '#title' => t('Upload result file'), + '#size' => 48, + '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . + t('Allowed file extensions : ') . variable_get('lab_migration_result_extensions', ''), ); $form['xcos'] = array( @@ -180,18 +180,18 @@ function lab_migration_bulk_upload_code_form($form_state) '#collapsed' => FALSE, ); $form['xcos']['xcos1'] = array( - '#type' => 'file', - '#title' => t('Upload xcos file'), - '#size' => 48, - '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . - t('Allowed file extensions : ') . variable_get('lab_migration_xcos_extensions', ''), + '#type' => 'file', + '#title' => t('Upload xcos file'), + '#size' => 48, + '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . + t('Allowed file extensions : ') . variable_get('lab_migration_xcos_extensions', ''), ); $form['xcos']['xcos2'] = array( - '#type' => 'file', - '#title' => t('Upload xcos file'), - '#size' => 48, - '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . - t('Allowed file extensions : ') . variable_get('lab_migration_xcos_extensions', ''), + '#type' => 'file', + '#title' => t('Upload xcos file'), + '#size' => 48, + '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') . '<br />' . + t('Allowed file extensions : ') . variable_get('lab_migration_xcos_extensions', ''), ); $form['submit'] = array( diff --git a/dependency.inc b/dependency.inc index 11350bb..dadce3d 100755 --- a/dependency.inc +++ b/dependency.inc @@ -37,20 +37,20 @@ function lab_migration_upload_dependency_form($form_state) '#collapsed' => FALSE, ); $form['depfile']['depfile1'] = array( - '#type' => 'file', - '#title' => t('Upload dependency file'), - '#description' => t("Allowed file extensions : ") . variable_get('lab_migration_dependency_extensions', ''), + '#type' => 'file', + '#title' => t('Upload dependency file'), + '#description' => t("Allowed file extensions : ") . variable_get('lab_migration_dependency_extensions', ''), ); $form['depfile']['depfile1_caption'] = array( - '#type' => 'textfield', - '#title' => t('Caption for dependency file'), - '#size' => 15, - '#maxlength' => 100, - '#required' => TRUE, + '#type' => 'textfield', + '#title' => t('Caption for dependency file'), + '#size' => 15, + '#maxlength' => 100, + '#required' => TRUE, ); $form['depfile']['depfile1_description'] = array( - '#type' => 'textarea', - '#title' => t('Brief Description of the dependency file'), + '#type' => 'textarea', + '#title' => t('Brief Description of the dependency file'), ); $form['submit'] = array( diff --git a/manage_proposal.inc b/manage_proposal.inc index 82e74ca..6f95f10 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -399,9 +399,9 @@ function lab_migration_proposal_status_form($form_state) default: $proposal_status = t('Unkown'); break; } $form['proposal_status'] = array( - '#type' => 'item', - '#value' => $proposal_status, - '#title' => t('Proposal Status'), + '#type' => 'item', + '#value' => $proposal_status, + '#title' => t('Proposal Status'), ); if ($proposal_data->approval_status == 0) diff --git a/manage_solution_proposal.inc b/manage_solution_proposal.inc index b6338f4..8dfdb59 100755 --- a/manage_solution_proposal.inc +++ b/manage_solution_proposal.inc @@ -110,11 +110,11 @@ function lab_migration_solution_proposal_approval_form($form_state) $solution_provider_user_data = user_load($proposal_data->solution_provider_uid); if ($solution_provider_user_data) { $solution_provider .= '<ul>' . - '<li><strong>Solution Provider:</strong> ' . l($solution_provider_user_data->name, 'user/' . $proposal_data->solution_provider_uid) . '</li>' . - '<li><strong>Solution Provider Name:</strong> ' . $proposal_data->solution_provider_name_title . ' ' . $proposal_data->solution_provider_name . '</li>' . - '<li><strong>Department:</strong> ' . $proposal_data->solution_provider_department . '</li>' . - '<li><strong>University:</strong> ' . $proposal_data->solution_provider_university . '</li>' . - '</ul>'; + '<li><strong>Solution Provider:</strong> ' . l($solution_provider_user_data->name, 'user/' . $proposal_data->solution_provider_uid) . '</li>' . + '<li><strong>Solution Provider Name:</strong> ' . $proposal_data->solution_provider_name_title . ' ' . $proposal_data->solution_provider_name . '</li>' . + '<li><strong>Department:</strong> ' . $proposal_data->solution_provider_department . '</li>' . + '<li><strong>University:</strong> ' . $proposal_data->solution_provider_university . '</li>' . + '</ul>'; } else { $solution_provider = "User does not exists"; } @@ -97,22 +97,22 @@ function lab_migration_run_form($form_state) $user_solution_provider = user_load($lab_details->solution_provider_uid); if ($user_solution_provider) { $solution_provider = '<span style="color: rgb(128, 0, 0);"><strong>Solution Provider</strong></span></td><td style="width: 35%;"><br />' . - '<ul>' . - '<li><strong>Solution Provider Name:</strong> ' . $lab_details->solution_provider_name_title . ' ' . $lab_details->solution_provider_name . '</li>' . - '<li><strong>Department:</strong> ' . $lab_details->solution_provider_department . '</li>' . - '<li><strong>University:</strong> ' . $lab_details->solution_provider_university . '</li>' . - '</ul>'; + '<ul>' . + '<li><strong>Solution Provider Name:</strong> ' . $lab_details->solution_provider_name_title . ' ' . $lab_details->solution_provider_name . '</li>' . + '<li><strong>Department:</strong> ' . $lab_details->solution_provider_department . '</li>' . + '<li><strong>University:</strong> ' . $lab_details->solution_provider_university . '</li>' . + '</ul>'; } else { $solution_provider = '<span style="color: rgb(128, 0, 0);"><strong>Solution Provider</strong></span></td><td style="width: 35%;"><br />' . - '<ul>' . - '<li><strong>Solution Provider: </strong> (Open) </li>' . - '</ul>'; + '<ul>' . + '<li><strong>Solution Provider: </strong> (Open) </li>' . + '</ul>'; } } else { $solution_provider = '<span style="color: rgb(128, 0, 0);"><strong>Solution Provider</strong></span></td><td style="width: 35%;"><br />' . - '<ul>' . - '<li><strong>Solution Provider: </strong> (Open) </li>' . - '</ul>'; + '<ul>' . + '<li><strong>Solution Provider: </strong> (Open) </li>' . + '</ul>'; } $category_data = lab_migration_get_category_name($lab_details->category); @@ -120,14 +120,14 @@ function lab_migration_run_form($form_state) $form['run']['lab_details'] = array( '#type' => 'item', '#value' => '<span style="color: rgb(128, 0, 0);"><strong>About the Lab</strong></span></td><td style="width: 35%;"><br />' . - '<ul>' . - '<li><strong>Proposer Name:</strong> ' . $lab_details->name_title . ' ' . $lab_details->name . '</li>' . - '<li><strong>Title of the Lab:</strong> ' . $lab_details->lab_title . '</li>' . - '<li><strong>Department:</strong> ' . $lab_details->department . '</li>' . - '<li><strong>University:</strong> ' . $lab_details->university . '</li>' . - '<li><strong>Category:</strong> ' . $category_data . '</li>' . - '</ul>' . - $solution_provider, + '<ul>' . + '<li><strong>Proposer Name:</strong> ' . $lab_details->name_title . ' ' . $lab_details->name . '</li>' . + '<li><strong>Title of the Lab:</strong> ' . $lab_details->lab_title . '</li>' . + '<li><strong>Department:</strong> ' . $lab_details->department . '</li>' . + '<li><strong>University:</strong> ' . $lab_details->university . '</li>' . + '<li><strong>Category:</strong> ' . $category_data . '</li>' . + '</ul>' . + $solution_provider, ); $form['run']['download_lab'] = array( |