Revert "adding timezone to time fields" This reverts commit de69764c727384da148ba2ae673ca5277912b390.
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/211c3a11 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/211c3a11 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/211c3a11 Branch: refs/heads/master Commit: 211c3a114704f4d20d5e41dbc4c7ea51e79f90c5 Parents: aa4d3b4 Author: Supun Nakandala <[email protected]> Authored: Thu Jun 11 22:50:46 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Thu Jun 11 22:50:46 2015 +0530 ---------------------------------------------------------------------- app/views/project/summary.blade.php | 2 +- public/js/time-conversion.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/211c3a11/app/views/project/summary.blade.php ---------------------------------------------------------------------- diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php index 81680aa..51d22db 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>'; + echo '<div class="panel panel-default">'; 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/211c3a11/public/js/time-conversion.js ---------------------------------------------------------------------- diff --git a/public/js/time-conversion.js b/public/js/time-conversion.js index 1675aa8..29bf960 100644 --- a/public/js/time-conversion.js +++ b/public/js/time-conversion.js @@ -25,9 +25,7 @@ function convertTimestamp(timestamp) { // ie: 2013-02-18, 8:35 AM time = yyyy + '-' + mm + '-' + dd + ', ' + h + ':' + min + ' ' + ampm; - var offset = new Date().toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]; - - return time + " - " + offset; + return time; } $(document).ready( function(){
