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/07/08 22:57:10 UTC
[1/3] airavata-php-gateway git commit: fixing AIRAVATA-1754
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 363264005 -> c04755b57
fixing AIRAVATA-1754
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/ccd5a937
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ccd5a937
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ccd5a937
Branch: refs/heads/master
Commit: ccd5a93707fa8d83f5f780e257dce72226c16269
Parents: 3632640
Author: Supun Nakandala <sc...@apache.org>
Authored: Thu Jul 9 01:11:46 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Thu Jul 9 01:11:46 2015 +0530
----------------------------------------------------------------------
app/config/pga_config.php.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ccd5a937/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index ad94dcb..0721b57 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -124,7 +124,7 @@ return array(
/**
* Default total core count
*/
- 'total-cpu-count' => '4',
+ 'total-cpu-count' => '16',
/**
* Default wall time limit
[3/3] airavata-php-gateway git commit: fixing AIRAVATA-1706
Posted by sc...@apache.org.
fixing AIRAVATA-1706
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/c04755b5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c04755b5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c04755b5
Branch: refs/heads/master
Commit: c04755b576bcdbd9ff129e52b88a9f46eca6ad35
Parents: 636a45d
Author: Supun Nakandala <sc...@apache.org>
Authored: Thu Jul 9 02:23:54 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Thu Jul 9 02:23:54 2015 +0530
----------------------------------------------------------------------
app/views/project/summary.blade.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c04755b5/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index a05c59e..5fd323b 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -7,16 +7,16 @@
@section('content')
<div class="container" style="max-width: 750px;">
-
-
-<h1>Project Summary</h1>
-
-
-
<?php
-
- $project = ProjectUtilities::get_project($_GET['projId']);
-
+ $project = ProjectUtilities::get_project($_GET['projId']);
+ ?>
+ <h1>Project Summary
+ @if( !isset($dashboard))
+ <small><a href="{{ URL::to('/') }}/project/summary?projId={{ $project->projectID }}"
+ title="Refresh"><span class="glyphicon glyphicon-refresh refresh-exp"></span></a></small>
+ @endif
+ </h1>
+ <?php
echo '<div>';
[2/3] airavata-php-gateway git commit: fixing AIRAVATA-1752
Posted by sc...@apache.org.
fixing AIRAVATA-1752
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/636a45d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/636a45d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/636a45d1
Branch: refs/heads/master
Commit: 636a45d1b32c348cd525e1fc1deed498e4a1b255
Parents: ccd5a93
Author: Supun Nakandala <sc...@apache.org>
Authored: Thu Jul 9 02:08:08 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Thu Jul 9 02:08:08 2015 +0530
----------------------------------------------------------------------
app/views/partials/experiment-queue-block.blade.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/636a45d1/app/views/partials/experiment-queue-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php
index 38b7e30..2cf4edf 100644
--- a/app/views/partials/experiment-queue-block.blade.php
+++ b/app/views/partials/experiment-queue-block.blade.php
@@ -43,14 +43,14 @@
<div class="input-group">
<input type="number" class="form-control" name="wall-time" id="wall-time" min="1"
- value="@if(isset($expVal) ){{ $expVal['scheduling']->wallTimeLimit }}@else{{$queueDefaults['wallTimeLimit']}}@endif"
+ value="@if(isset($expVal)){{$expVal['scheduling']->wallTimeLimit}}@else{{$queueDefaults['wallTimeLimit']}}@endif"
required
@if(isset($expVal)) @if(!$expVal['editable']){{disabled}} @endif @endif>
<span class="input-group-addon">minutes</span>
</div>
</div>
<div class="form-group">
- <label for="wall-time">Total Physical Memory <span>( Max Allowed Memory - <span
+ <label for="physical-memory">Total Physical Memory <span>( Max Allowed Memory - <span
class="memory-count alert-warning"></span>)</span></label>
<div class="input-group">
@@ -93,8 +93,8 @@
$(".cpu-count").parent().addClass("hide");
//walltime-count
- if (queues[i]['maxRunTime'] != 0 && queues[i]['maxRunTime'] != null) {
- $("#wall-time").attr("max", queues[i]['maxRunTime']).val(0);
+ if (queues[i]['maxRunTime'] != null && queues[i]['maxRunTime'] != 0) {
+ $("#wall-time").attr("max", queues[i]['maxRunTime']);
$(".walltime-count").html(queues[i]['maxRunTime']);
$(".walltime-count").parent().removeClass("hide");
}