Fixing Reset Password UI issue
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/38248a22 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/38248a22 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/38248a22 Branch: refs/heads/master Commit: 38248a228ba18036b0f7228e99c49991dcc1f1a1 Parents: 3382987 Author: Nipurn Doshi <[email protected]> Authored: Tue Mar 8 14:53:38 2016 -0500 Committer: Nipurn Doshi <[email protected]> Committed: Tue Mar 8 14:53:38 2016 -0500 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 2 -- app/views/account/reset-password.blade.php | 1 + app/views/partials/experiment-info.blade.php | 16 ++++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38248a22/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index 6dead87..eca7421 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -116,7 +116,6 @@ class ExperimentController extends BaseController } } $expVal["jobDetails"] = $jobDetails; - $data = array( "expId" => Input::get("expId"), @@ -283,7 +282,6 @@ class ExperimentController extends BaseController $expContainer = ExperimentUtilities::get_expsearch_results_with_pagination(Input::all(), $this->limit, ($pageNo - 1) * $this->limit); $experimentStates = ExperimentUtilities::getExpStates(); - return View::make('experiment/browse', array( 'input' => Input::all(), 'pageNo' => $pageNo, http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38248a22/app/views/account/reset-password.blade.php ---------------------------------------------------------------------- diff --git a/app/views/account/reset-password.blade.php b/app/views/account/reset-password.blade.php index cfb9129..c830f06 100644 --- a/app/views/account/reset-password.blade.php +++ b/app/views/account/reset-password.blade.php @@ -36,4 +36,5 @@ </div> </form> +</div> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38248a22/app/views/partials/experiment-info.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php index 81ac668..79afcf4 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -129,27 +129,31 @@ </tr> <tr> <td><strong>Wall time</strong></td> - <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->wallTimeLimit; ?></td> + <td>{{ $experiment->userConfigurationData->computationalResourceScheduling->wallTimeLimit }}</td> </tr> <tr> <td><strong>CPU count</strong></td> - <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->totalCPUCount; ?></td> + <td>{{ $experiment->userConfigurationData->computationalResourceScheduling->totalCPUCount }}</td> </tr> <tr> <td><strong>Node count</strong></td> - <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->nodeCount; ?></td> + <td>{{ $experiment->userConfigurationData->computationalResourceScheduling->nodeCount }}</td> </tr> <tr> <td><strong>Queue</strong></td> - <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->queueName; ?></td> + <td>{{ $experiment->userConfigurationData->computationalResourceScheduling->queueName }}</td> </tr> <tr> <td><strong>Inputs</strong></td> - <td><?php ExperimentUtilities::list_input_files($experiment->experimentInputs); ?></td> + <td>{{ ExperimentUtilities::list_input_files($experiment->experimentInputs) }}</td> </tr> <tr> <td><strong>Outputs</strong></td> - <td><?php ExperimentUtilities::list_output_files($experiment->experimentOutputs, $experiment->experimentStatus->state, false); ?></td> + <td>{{ ExperimentUtilities::list_output_files($experiment->experimentOutputs, $experiment->experimentStatus->state, false) }}</td> + </tr> + <tr> + <td><strong>Storage Directory</strong></td> + <td><a href="{{URL::to('/')}}/files/browse?path={{$experiment->userConfigurationData->experimentDataDir}}" target="_blank">Open</a></td> </tr> <!-- an experiment is editable only when it has not failed. otherwise, show errors. --> {{-- @if( $expVal["editable"] == false)--}}
