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 2016/01/14 16:43:23 UTC
[27/50] [abbrv] airavata-php-gateway git commit: ammendments to the
previous commit
ammendments to the previous commit
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/0d8fb566
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0d8fb566
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0d8fb566
Branch: refs/heads/develop
Commit: 0d8fb566e923cffbbf62e34ecf032dbdb70d044c
Parents: 55cbd9e
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 13:00:45 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 13:00:45 2016 -0500
----------------------------------------------------------------------
app/views/resource/browse.blade.php | 30 ++++++++++++++----------
app/views/storage-resource/browse.blade.php | 8 +++----
2 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d8fb566/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index 6b3ffa1..2f5095f 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -74,28 +74,34 @@
<td>
@if(!$enabled)
<div class="checkbox">
- <input class="resource-status" resourceId="{{$crId}}" type="checkbox">
+ <input class="resource-status" resourceId="{{$crId}}" type="checkbox"
+ @if(!Session::has("scigap_admin"))
+ disabled="disabled"
+ @endif
+ >
</div>
@else
<div class="checkbox">
- <input class="resource-status" type="checkbox" resourceId="{{$crId}}" checked>
+ <input class="resource-status" type="checkbox" resourceId="{{$crId}}" checked
+ @if(!Session::has("scigap_admin"))
+ disabled="disabled"
+ @endif
+ >
</div>
@endif
</td>
- <td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
- <span class="glyphicon glyphicon-pencil"></span>
+ <td><a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
+ <span class="glyphicon glyphicon-list"></span>
</a>
</td>
@endif
@if(Session::has("scigap_admin"))
- <td>
- <a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
- <span class="glyphicon glyphicon-list"></span>
- </a>
- </td>
- @endif
- @if(Session::has("scigap_admin"))
- <td>
+ <td>
+ <a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
+ <span class="glyphicon glyphicon-pencil"></span>
+ </a>
+ </td>
+ <td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-cr" data-toggle="modal"
data-target="#delete-cr-block" data-delete-cr-name="{{$crName}}"
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d8fb566/app/views/storage-resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/browse.blade.php b/app/views/storage-resource/browse.blade.php
index a15307d..5edde1c 100644
--- a/app/views/storage-resource/browse.blade.php
+++ b/app/views/storage-resource/browse.blade.php
@@ -48,11 +48,11 @@
<tr>
<th>Id</th>
<th>Hostname</th>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<th>Edit</th>
@endif
<th>View</th>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<th>Delete</th>
@endif
</tr>
@@ -65,7 +65,7 @@
<tr id="srDetails">
<td>{{ $srId }}</td>
<td>{{ $hostName }}</td>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<td><a href="{{URL::to('/')}}/sr/edit?srId={{ $srId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
@@ -76,7 +76,7 @@
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-sr" data-toggle="modal"