You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/04/01 18:45:54 UTC
[1/3] airavata-php-gateway git commit: Gateway preferences search fix.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 57ccfb336 -> 4749da918
Gateway preferences search fix.
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/bf108536
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bf108536
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bf108536
Branch: refs/heads/develop
Commit: bf1085369b65d709b8ab11dcfbe8e169ed13f0aa
Parents: 65f1fdb
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Apr 1 12:16:19 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Apr 1 12:16:19 2016 -0400
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 4 +---
app/views/application/module.blade.php | 2 +-
public/js/gateway.js | 2 +-
public/js/interface.js | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bf108536/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index a455321..e7bd0a5 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -102,12 +102,10 @@
</form>
</div>
- <div class="panel-group" id="accordion1">
- <div class='super-admin-gateways-view'>
+ <div class="panel-group super-admin-gateways-view" id="accordion1">
@foreach( $gateways as $indexGP => $gp )
@include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion1"))
@endforeach
- </div>
</div>
@endif
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bf108536/app/views/application/module.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/module.blade.php b/app/views/application/module.blade.php
index 94715c3..d7eb42a 100644
--- a/app/views/application/module.blade.php
+++ b/app/views/application/module.blade.php
@@ -191,7 +191,7 @@
children = ($("#accordion").children());
var containing = children.filter(function () {
- var regex = new RegExp('\\b' + a, 'i');
+ var regex = new RegExp(a, 'i');
return regex.test($('a', this).text());
}).slideDown();
children.not(containing).slideUp();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bf108536/public/js/gateway.js
----------------------------------------------------------------------
diff --git a/public/js/gateway.js b/public/js/gateway.js
index d60326a..331125d 100644
--- a/public/js/gateway.js
+++ b/public/js/gateway.js
@@ -17,7 +17,7 @@ $(document).ready(function () {
children = ($("#accordion1").children());
var containing = children.filter(function () {
- var regex = new RegExp('\\b' + a, 'i');
+ var regex = new RegExp(a, 'i');
return regex.test($('a', this).text());
}).slideDown();
children.not(containing).slideUp();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bf108536/public/js/interface.js
----------------------------------------------------------------------
diff --git a/public/js/interface.js b/public/js/interface.js
index 9de1c21..7526d14 100644
--- a/public/js/interface.js
+++ b/public/js/interface.js
@@ -53,7 +53,7 @@ $(document).ready( function(){
children = ($("#accordion").children());
var containing = children.filter(function () {
- var regex = new RegExp('\\b' + a, 'i');
+ var regex = new RegExp(a, 'i');
return regex.test($('a', this).text());
}).slideDown();
children.not(containing).slideUp();
[3/3] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/4749da91
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4749da91
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4749da91
Branch: refs/heads/develop
Commit: 4749da9184e92ed24838f7929ffded67bb0c458e
Parents: e4a7b19 57ccfb3
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Apr 1 12:45:25 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Apr 1 12:45:25 2016 -0400
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] airavata-php-gateway git commit: Fix for dates on the first
date of a month.
Posted by nd...@apache.org.
Fix for dates on the first date of a month.
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/e4a7b192
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e4a7b192
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e4a7b192
Branch: refs/heads/develop
Commit: e4a7b19222c75aca4035ab08af7eaefaed689676
Parents: bf10853
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Apr 1 12:44:29 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Apr 1 12:44:29 2016 -0400
----------------------------------------------------------------------
app/views/admin/manage-experiments.blade.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e4a7b192/app/views/admin/manage-experiments.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php
index cb3b2d8..e4f21c5 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -460,6 +460,10 @@ to be uncommented when actually in use.
function getCurrentDate( subtractDaysFromToday){
var cd = new Date();
+ if( subtractDaysFromToday!= null)
+ {
+ cd = new Date( cd.setDate( cd.getDate() - subtractDaysFromToday) );
+ }
var hours = cd.getHours();
month = cd.getMonth() + 1; //getmonth()starts from 0 for some reason
var timeOfDay = "AM";
@@ -470,9 +474,7 @@ to be uncommented when actually in use.
hours = hours - 12;
}
var date = cd.getDate();
- if( subtractDaysFromToday!= null)
- date = date - subtractDaysFromToday;
-
+
var todayDate = month + "/" + date + "/" + cd.getFullYear() + " " + hours + ":" + cd.getUTCMinutes() + " " + timeOfDay;
return todayDate;
}