Repository: airavata-php-gateway Updated Branches: refs/heads/master a88115a63 -> 0560d6232
Fixing experiment info not shown in Admin DashBoard 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/0560d623 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0560d623 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0560d623 Branch: refs/heads/master Commit: 0560d62320c421d4ad9ab5f19b64346175906d3e Parents: a88115a Author: Supun Nakandala <[email protected]> Authored: Sat Jun 6 14:05:27 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Sat Jun 6 14:14:05 2015 +0530 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 6 +- app/libraries/AppUtilities.php | 2 +- app/libraries/ExperimentUtilities.php | 2 +- app/views/account/create.blade.php | 4 +- app/views/account/login.blade.php | 2 +- app/views/admin/manage-experiments.blade.php | 109 +++++++++++----------- app/views/resource/browse.blade.php | 3 +- 7 files changed, 62 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index e5f0baa..8b568db 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -66,7 +66,7 @@ class ExperimentController extends BaseController /* Not required. else { - Utilities::print_success_message("<p>Experiment {$_POST['experiment-name']} created!</p>" . + CommonUtilities::print_success_message("<p>Experiment {$_POST['experiment-name']} created!</p>" . '<p>You will be redirected to the summary page shortly, or you can <a href=' . URL::to('/') . '"/experiment/summary?expId=' . $expId . '">go directly</a> to experiment summary page.</p>'); @@ -137,9 +137,9 @@ class ExperimentController extends BaseController $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment); /*if (isset($_POST['save'])) { - $updatedExperiment = Utilities::apply_changes_to_experiment($experiment); + $updatedExperiment = CommonUtilities::apply_changes_to_experiment($experiment); - Utilities::update_experiment($experiment->experimentID, $updatedExperiment); + CommonUtilities::update_experiment($experiment->experimentID, $updatedExperiment); }*/ if (isset($_POST['launch'])) { ExperimentUtilities::launch_experiment($experiment->experimentID); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/libraries/AppUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php index 0eb9e2a..a789fcf 100644 --- a/app/libraries/AppUtilities.php +++ b/app/libraries/AppUtilities.php @@ -224,7 +224,7 @@ class AppUtilities CommonUtilities::print_warning_message('<p>You must create an application module, interface and deployment space before you can create an experiment. Click <a href="' . URL::to('/') . '/app/module">here</a> to create an application.</p>'); /* - Utilities::print_error_message('<p>There was a problem getting all applications. + CommonUtilities::print_error_message('<p>There was a problem getting all applications. Please try again later or submit a bug report using the link in the Help menu.</p>' . '<p>Airavata System Exception: ' . $ase->getMessage() . '</p>'); */ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php index 9f6c6b9..2561168 100644 --- a/app/libraries/ExperimentUtilities.php +++ b/app/libraries/ExperimentUtilities.php @@ -556,7 +556,7 @@ class ExperimentUtilities if ($expId) { /* - Utilities::print_success_message("Experiment {$_POST['experiment-name']} created!" . + CommonUtilities::print_success_message("Experiment {$_POST['experiment-name']} created!" . ' <a href="experiment_summary.php?expId=' . $expId . '">Go to experiment summary page</a>'); */ } else { http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/views/account/create.blade.php ---------------------------------------------------------------------- diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php index 7d92a7f..0709d2e 100755 --- a/app/views/account/create.blade.php +++ b/app/views/account/create.blade.php @@ -17,7 +17,7 @@ @if ($errors->has()) @foreach ($errors->all() as $error) - {{ Utilities::print_error_message($error) }} + {{ CommonUtilities::print_error_message($error) }} @endforeach @endif @@ -25,7 +25,7 @@ <form action="create" method="post" role="form"> @if( Session::has('username_exists')) - {{ Utilities::print_error_message('The username you entered is already in use. Please select another.') }} + {{ CommonUtilities::print_error_message('The username you entered is already in use. Please select another.') }} @endif <?php Session::forget("username_exists"); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/views/account/login.blade.php ---------------------------------------------------------------------- diff --git a/app/views/account/login.blade.php b/app/views/account/login.blade.php index 2d6d58e..7ef30cc 100755 --- a/app/views/account/login.blade.php +++ b/app/views/account/login.blade.php @@ -18,7 +18,7 @@ <form action="login" method="post" role="form"> @if( Session::has("invalid-credentials") ) - {{ Utilities::print_error_message('Invalid username or password. Please try again.') }} + {{ CommonUtilities::print_error_message('Invalid username or password. Please try again.') }} @endif <?php Session::forget("invalid-credentials"); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/views/admin/manage-experiments.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php index eb97fba..c6aae9b 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -394,8 +394,6 @@ to be uncommented when actually in use. --> <!-- Flot Charts JavaScript --> -<!--[if lte IE 8]> -<script src="js/excanvas.min.js')}}<![endif]--> {{ HTML::script('js/flot/jquery.flot.js')}} {{ HTML::script('js/flot/jquery.flot.tooltip.min.js')}} {{ HTML::script('js/flot/jquery.flot.resize.js')}} @@ -412,67 +410,64 @@ to be uncommented when actually in use. $(".add-tenant").slideDown(); }); - $(function () { - $('.tree li:has(ul)').addClass('parent_li').find(' > span').attr('title', 'Collapse this branch'); - $('.tree li.parent_li > span').on('click', function (e) { - var children = $(this).parent('li.parent_li').find(' > ul > li'); - if (children.is(":visible")) { - children.hide('fast'); - $(this).attr('title', 'Expand this branch').find(' > i').addClass('icon-plus-sign').removeClass('icon-minus-sign'); - } else { - children.show('fast'); - $(this).attr('title', 'Collapse this branch').find(' > i').addClass('icon-minus-sign').removeClass('icon-plus-sign'); - } - e.stopPropagation(); - }); - - $(".get-experiment").click(function () { - $(".loading-img").removeClass("hide"); - $.ajax({ - url: 'experiment/summary?expId=' + $(".experimentId").val(), - type: 'get', - success: function (data) { - $(".experiment-info").html(data); - - } - }).complete(function () { - $(".loading-img").addClass("hide"); - }); - }); - - //Experiment stages are under development. - $(".tree").parent().addClass("hide"); + $('.tree li:has(ul)').addClass('parent_li').find(' > span').attr('title', 'Collapse this branch'); + $('.tree li.parent_li > span').on('click', function (e) { + var children = $(this).parent('li.parent_li').find(' > ul > li'); + if (children.is(":visible")) { + children.hide('fast'); + $(this).attr('title', 'Expand this branch').find(' > i').addClass('icon-plus-sign').removeClass('icon-minus-sign'); + } else { + children.show('fast'); + $(this).attr('title', 'Collapse this branch').find(' > i').addClass('icon-minus-sign').removeClass('icon-plus-sign'); + } + e.stopPropagation(); + }); - /* making datetimepicker work for exp search */ + $(".get-experiment").click(function () { + $(".loading-img").removeClass("hide"); + $.ajax({ + url: 'experiment/summary?expId=' + $(".experimentId").val(), + type: 'get', + success: function (data) { + $(".experiment-info").html(data); - $('#datetimepicker9').datetimepicker({ - pick12HourFormat: false - }); - $('#datetimepicker10').datetimepicker({ - pick12HourFormat: false - }); - $("#datetimepicker9").on("dp.change", function (e) { - $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date); - }); - $("#datetimepicker10").on("dp.change", function (e) { - $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date); + } + }).complete(function () { + $(".loading-img").addClass("hide"); }); + }); - /* selecting creation time */ - $("#search-key").on("change", function () { - if (this.value == "creation-time") { - $(".search-text-block").addClass("hide"); - $(".select-dates").removeClass("hide"); - $("#search-value").removeAttr("required"); + //Experiment stages are under development. + $(".tree").parent().addClass("hide"); - } - else { - $(".search-text-block").removeClass("hide"); - $(".select-dates").addClass("hide"); - $("#search-value").attr("required"); - } - }); + /* making datetimepicker work for exp search */ + + $('#datetimepicker9').datetimepicker({ + pick12HourFormat: false + }); + $('#datetimepicker10').datetimepicker({ + pick12HourFormat: false + }); + $("#datetimepicker9").on("dp.change", function (e) { + $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date); + }); + $("#datetimepicker10").on("dp.change", function (e) { + $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date); + }); + /* selecting creation time */ + $("#search-key").on("change", function () { + if (this.value == "creation-time") { + $(".search-text-block").addClass("hide"); + $(".select-dates").removeClass("hide"); + $("#search-value").removeAttr("required"); + + } + else { + $(".search-text-block").removeClass("hide"); + $(".select-dates").addClass("hide"); + $("#search-value").attr("required"); + } }); </script> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0560d623/app/views/resource/browse.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php index ac78bfa..d50e359 100644 --- a/app/views/resource/browse.blade.php +++ b/app/views/resource/browse.blade.php @@ -16,7 +16,8 @@ @if ( isset( $allCRs) ) @if (sizeof($allCRs) == 0) - {{ Utilities::print_warning_message('No Compute Resources are registered. Please use "Register Compute Resource" to + {{ CommonUtilities::print_warning_message('No Compute Resources are registered. Please use "Register Compute + Resource" to register a new resources.') }} @else <div class="col-md-12">
