You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/09 21:51:45 UTC
airavata-php-gateway git commit: adding timezone to time fields
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 844ce86ca -> de69764c7
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/de69764c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/de69764c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/de69764c
Branch: refs/heads/master
Commit: de69764c727384da148ba2ae673ca5277912b390
Parents: 844ce86
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jun 10 01:21:14 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jun 10 01:21:14 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/de69764c/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/de69764c/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(){