airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [05/42] airavata-php-gateway git commit: adding timezone to time fields
Date Mon, 13 Jul 2015 17:24:59 GMT
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/airavata-php-gateway-0.15-release
Commit: de69764c727384da148ba2ae673ca5277912b390
Parents: 844ce86
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Wed Jun 10 01:21:14 2015 +0530
Committer: Supun Nakandala <scnakandala@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(){


Mime
View raw message