Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/94f291d1 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/94f291d1 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/94f291d1 Branch: refs/heads/master Commit: 94f291d101301bec056e50b04ecfba7ddfcdc3a6 Parents: 9af720f f77cd6f Author: scnakandala <[email protected]> Authored: Wed Feb 3 08:16:11 2016 -0500 Committer: scnakandala <[email protected]> Committed: Wed Feb 3 08:16:11 2016 -0500 ---------------------------------------------------------------------- app/controllers/AdminController.php | 163 ++++++---- app/controllers/ApplicationController.php | 35 ++- app/controllers/ExperimentController.php | 5 + app/controllers/GatewayprofileController.php | 8 +- app/controllers/ResourceController.php | 211 ------------- app/controllers/StorageResourceController.php | 5 +- app/libraries/AppUtilities.php | 23 ++ app/libraries/CRUtilities.php | 17 +- app/libraries/ExperimentUtilities.php | 24 +- app/libraries/SRUtilities.php | 12 +- app/routes.php | 6 +- app/views/account/dashboard.blade.php | 2 +- app/views/admin/manage-experiments.blade.php | 8 +- app/views/admin/manage-gateway.blade.php | 310 ++++--------------- app/views/admin/manage-roles.blade.php | 48 ++- app/views/experiment/summary.blade.php | 2 +- app/views/gateway/browse.blade.php | 2 +- .../compute-resource-preferences.blade.php | 16 +- app/views/partials/experiment-info.blade.php | 51 ++- .../gateway-preferences-block.blade.php | 249 +++++++++++++++ .../storage-resource-preferences.blade.php | 16 +- public/css/admin.css | 4 +- public/css/bootstrap.min.css | 2 +- public/js/gateway.js | 3 +- 24 files changed, 595 insertions(+), 627 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/94f291d1/app/routes.php ----------------------------------------------------------------------
