Repository: airavata-php-gateway Updated Branches: refs/heads/airavata-php-gateway-0.15-release e428e89f5 -> 48bec91b3
adding timezone to time fields 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/2cf21030 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2cf21030 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2cf21030 Branch: refs/heads/airavata-php-gateway-0.15-release Commit: 2cf21030a462b7c530072f4898f9b4ff2e6e9975 Parents: e428e89 Author: Supun Nakandala <[email protected]> Authored: Wed Jun 10 01:21:14 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Wed Jun 10 01:27:11 2015 +0530 ---------------------------------------------------------------------- app/views/project/summary.blade.php | 2 +- public/js/time-conversion.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2cf21030/app/views/project/summary.blade.php ---------------------------------------------------------------------- diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php index d054384..aeb6579 100755 --- a/app/views/project/summary.blade.php +++ b/app/views/project/summary.blade.php @@ -18,7 +18,7 @@ $project = ProjectUtilities::get_project($_GET['projId']); - echo '<div class="panel panel-default">'; + echo '<div>'; echo '<div class="panel-heading">'; echo '<h3>' . $project->name . ' <a href="edit?projId=' . http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2cf21030/public/js/time-conversion.js ---------------------------------------------------------------------- diff --git a/public/js/time-conversion.js b/public/js/time-conversion.js index 29bf960..1675aa8 100644 --- a/public/js/time-conversion.js +++ b/public/js/time-conversion.js @@ -25,7 +25,9 @@ function convertTimestamp(timestamp) { // ie: 2013-02-18, 8:35 AM time = yyyy + '-' + mm + '-' + dd + ', ' + h + ':' + min + ' ' + ampm; - return time; + var offset = new Date().toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]; + + return time + " - " + offset; } $(document).ready( function(){
