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 2015/05/14 20:12:42 UTC
[3/4] airavata-php-gateway git commit: Bug Fixes in cloning an
experiment + Admin Experiment Review in progress.
Bug Fixes in cloning an experiment + Admin Experiment Review in progress.
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/f82bdcb0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f82bdcb0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f82bdcb0
Branch: refs/heads/master
Commit: f82bdcb00e7e65abd5e0f4f41ac5381396942bb8
Parents: ba9234d
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu May 14 13:27:40 2015 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu May 14 13:27:40 2015 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 2 +-
app/views/admin/manage-experiments.blade.php | 6 +++---
app/views/admin/manage-users.blade.php | 26 +++++++++++------------
app/views/layout/basic.blade.php | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f82bdcb0/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 1c1fe2c..0c8e514 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -69,7 +69,7 @@ class AdminController extends BaseController {
public function rolesView(){
- $roles = WSIS::getAllRolles();
+ $roles = WSIS::getAllRoles();
return View::make("admin/manage-roles", array("roles" => $roles));
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f82bdcb0/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 ebb693d..149a5af 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -201,20 +201,20 @@
<div style="width:4px;height:0;border:5px solid rgb(237,194,64);overflow:hidden"></div>
</div>
</td>
- <td class="legendLabel">sin(x)</td>
+ <td class="legendLabel">Canceled Experiments</td>
</tr>
<tr>
<td class="legendColorBox">
<div style="border:1px solid #ccc;padding:1px"><div style="width:4px;height:0;border:5px solid rgb(175,216,248);overflow:hidden"></div></div>
</td>
- <td class="legendLabel">cos(x)</td>
+ <td class="legendLabel">Successful Experiments</td>
</tr>
</tbody>
</table>
</div>
</div>
-
+
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f82bdcb0/app/views/admin/manage-users.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-users.blade.php b/app/views/admin/manage-users.blade.php
index 5a500b5..7e8ee01 100644
--- a/app/views/admin/manage-users.blade.php
+++ b/app/views/admin/manage-users.blade.php
@@ -75,21 +75,21 @@
<div class="modal-body">
<h4 class="roles-of-user"></h4>
<div class="roles-load">
- Getting User Roles. Please Wait... <img src="{{URL::to('/')}}ajax-loader.gif"/>
+ Getting User Roles. Please Wait... <img src="{{URL::to('/')}}/assets/ajax-loader.gif"/>
</div>
<div class="roles-list">
- <div class="add-role-area">
- <div class="form-group">
- <label class="control-label">Add a new role to the user</label>
- <select name="new-role">
- <option>Select a role</option>
- @foreach( (array)$roles as $role)
- <option value="{{role}}">{{$role}}</option>
- @endforeach
- </select>
- </div>
- </div>
</div>
+ <div class="add-role">
+ <div class="form-group">
+ <label class="control-label">Add a new role to the user</label>
+ <select name="new-role">
+ <option>Select a role</option>
+ @foreach( (array)$roles as $role)
+ <option value="{{$role}}">{{$role}}</option>
+ @endforeach
+ </select>
+ </div>
+ </div>
</div>
<div class="modal-footer">
<div class="form-group">
@@ -123,7 +123,7 @@
$(".roles-list").addClass("hide");
$.ajax({
type: "POST",
- url: $(".base-url").val() + "/admin/checkroles",
+ url: $(".base-url").val() + "/admin/check-roles",
data:
{
username: userName
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f82bdcb0/app/views/layout/basic.blade.php
----------------------------------------------------------------------
diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php
index 947593e..5e5485e 100755
--- a/app/views/layout/basic.blade.php
+++ b/app/views/layout/basic.blade.php
@@ -100,7 +100,7 @@
var visitortimezone = visitortime.getTimezoneOffset()/60;
$.ajax({
type: "GET",
- url: "setUserTimezone",
+ url: "{{URL::to('/')/setUserTimezone",
data: 'timezone='+ visitortimezone,
success: function(){
//location.reload();