Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/ee31dc82 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ee31dc82 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ee31dc82 Branch: refs/heads/master Commit: ee31dc82b6671e316131008b010e47f0cad7f7c3 Parents: 422f99d 67f8c16 Author: scnakandala <[email protected]> Authored: Tue Feb 9 10:55:04 2016 -0500 Committer: scnakandala <[email protected]> Committed: Tue Feb 9 10:55:04 2016 -0500 ---------------------------------------------------------------------- app/controllers/AccountController.php | 7 +- app/controllers/AdminController.php | 171 +- app/controllers/ApplicationController.php | 35 +- app/controllers/DataCatController.php | 23 + app/controllers/ExperimentController.php | 16 + app/controllers/GatewayprofileController.php | 8 +- app/controllers/ResourceController.php | 211 --- app/controllers/StorageResourceController.php | 8 +- app/filters.php | 2 +- app/libraries/AppUtilities.php | 23 + app/libraries/CRUtilities.php | 38 +- app/libraries/ExperimentUtilities.php | 50 +- app/libraries/SRUtilities.php | 12 +- app/libraries/Wsis/Stubs/UserStoreManager.php | 5 +- app/libraries/Wsis/Wsis.php | 5 +- app/routes.php | 18 +- app/views/account/dashboard.blade.php | 13 +- app/views/admin/manage-credentials.blade.php | 4 + app/views/admin/manage-experiments.blade.php | 24 +- app/views/admin/manage-gateway.blade.php | 335 +--- app/views/admin/manage-roles.blade.php | 48 +- app/views/application/module.blade.php | 1 - app/views/datacat/select.blade.php | 82 + app/views/datacat/summary.blade.php | 451 +++++ app/views/experiment/summary.blade.php | 2 +- app/views/gateway/browse.blade.php | 2 +- .../compute-resource-preferences.blade.php | 16 +- .../partials/experiment-container.blade.php | 34 +- app/views/partials/experiment-info.blade.php | 135 +- .../gateway-preferences-block.blade.php | 249 +++ .../storage-resource-preferences.blade.php | 16 +- app/views/project/summary.blade.php | 182 +- app/views/resource/browse.blade.php | 28 +- app/views/resource/edit.blade.php | 17 - app/views/storage-resource/browse.blade.php | 55 +- app/views/storage-resource/edit.blade.php | 7 +- public/css/admin.css | 4 +- public/css/bootstrap.min.css | 2 +- public/js/datacat/GLmol.js | 1708 ++++++++++++++++++ public/js/datacat/Three.js | 382 ++++ public/js/datacat/jquery-1.7.min.js | 4 + public/js/gateway.js | 13 +- public/js/script.js | 17 + public/js/time-conversion.js | 4 +- 44 files changed, 3548 insertions(+), 919 deletions(-) ----------------------------------------------------------------------
