Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
# Conflicts: # app/libraries/CommonUtilities.php 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/5c7e2647 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5c7e2647 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5c7e2647 Branch: refs/heads/develop Commit: 5c7e26471eb918957cb712b4f3a746148e85cf05 Parents: 8d1bcdc 6d12123 Author: Nipurn Doshi <[email protected]> Authored: Mon Oct 31 00:41:11 2016 -0700 Committer: Nipurn Doshi <[email protected]> Committed: Mon Oct 31 00:41:11 2016 -0700 ---------------------------------------------------------------------- app/controllers/AccountController.php | 182 +- app/libraries/AdminUtilities.php | 23 +- app/libraries/Airavata/API/Airavata.php | 19805 +++++++++++------ .../Model/AppCatalog/ComputeResource/Types.php | 2 + .../Model/AppCatalog/CredetialSummary/Types.php | 210 + .../AppCatalog/UserResourceProfile/Types.php | 788 + .../Airavata/Model/Credential/Store/Types.php | 1029 + app/libraries/AppUtilities.php | 17 + app/libraries/CRUtilities.php | 8 +- app/libraries/CommonUtilities.php | 30 +- app/libraries/ExperimentUtilities.php | 30 +- app/libraries/ProjectUtilities.php | 1 + app/libraries/URPUtilities.php | 140 + app/routes.php | 15 + app/views/account/credential-store.blade.php | 160 + app/views/account/dashboard.blade.php | 41 + .../account/user-compute-resources.blade.php | 162 + .../account/user-storage-resources.blade.php | 142 + app/views/admin/manage-experiments.blade.php | 2 +- app/views/admin/manage-gateway.blade.php | 2 +- app/views/admin/manage-notices.blade.php | 2 +- app/views/experiment/browse.blade.php | 2 +- .../experiment/no-sharing-browse.blade.php | 2 +- .../compute-resource-preferences.blade.php | 9 +- app/views/partials/experiment-info.blade.php | 4 +- .../user-compute-resource-preferences.blade.php | 142 + .../user-storage-resource-preferences.blade.php | 61 + public/js/clipboard.min.js | 7 + public/js/datetimepicker-3.1.3.js | 1 + public/js/datetimepicker.js | 1 - 30 files changed, 16644 insertions(+), 6376 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c7e2647/app/libraries/CommonUtilities.php ---------------------------------------------------------------------- diff --cc app/libraries/CommonUtilities.php index b7e434e,94e8626..1fef810 --- a/app/libraries/CommonUtilities.php +++ b/app/libraries/CommonUtilities.php @@@ -215,12 -216,16 +215,14 @@@ class CommonUtilitie if (Session::has("admin") || Session::has("admin-read-only")) - echo '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span> Admin Dashboard</a></li>'; + $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/admin/dashboard"><span class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>'; + else - echo '<li class="' . $active . '"><a href="' . URL::to("/") . '/account/dashboard"><span class="glyphicon glyphicon-user"></span> Dashboard</a></li>'; -// else -// echo '<li><a href="' . URL::to("/") . '/user/profile"><span class="glyphicon glyphicon-user"></span> Profile</a></li>'; ++ $navbar .= '<li class="' . $active . '"><a href="' . URL::to("/") . '/account/dashboard"><span class="glyphicon glyphicon-user"></span> Dashboard</a></li>'; - echo '<li class="dropdown"> + $navbar .= '<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">' . Session::get("username") . ' <span class="caret"></span></a>'; - echo '<ul class="dropdown-menu" role="menu">'; + $navbar .= '<ul class="dropdown-menu" role="menu">'; if ( Session::has("existing-gateway-provider")) { $requestedGateways = Session::get("requestedGateways");
