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/06/05 00:15:44 UTC
[04/10] airavata-php-gateway git commit: Cleaning and restructuring
PGA
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/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 8ea84cd..872acaf 100644
--- a/app/views/admin/manage-users.blade.php
+++ b/app/views/admin/manage-users.blade.php
@@ -1,129 +1,134 @@
@extends('layout.basic')
@section('page-header')
- @parent
- {{ HTML::style('css/admin.css')}}
+@parent
+{{ HTML::style('css/admin.css')}}
@stop
@section('content')
- <div id="wrapper">
- <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
- @include( 'partials/dashboard-block')
- <div id="page-wrapper">
- <div class="col-md-12">
+<div id="wrapper">
+ <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
+ @include( 'partials/dashboard-block')
+ <div id="page-wrapper">
+ <div class="col-md-12">
@if( Session::has("message"))
- <div class="row">
- <div class="alert alert-success alert-dismissible" role="alert">
- <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- {{ Session::get("message") }}
- </div>
- </div>
- {{ Session::forget("message") }}
- @endif
- </div>
- <div class="container-fluid">
- <div class="col-md-12">
-
- <h1 class="text-center">Users</h1>
-
- <table class="table table-striped table-condensed">
- <tr>
- <th>Username</th>
- <th>
- Role :
- <select onchange="location = this.options[this.selectedIndex].value;">
- <option>Select a role</option>
- <option value="{{URL::to('/')}}/admin/dashboard/users">All</option>
- @foreach( (array)$roles as $role)
- <option value="{{URL::to('/')}}/admin/dashboard/users?role={{$role}}">{{$role}}</option>
- @endforeach
- </select>
- </th>
- </tr>
- @foreach( (array)$users as $user)
- <tr class="user-row">
- <td>{{ $user }}</td>
- <td>
- <button class="button btn btn-default check-roles fade" type="button" data-username="{{$user}}">Check All Roles</button>
- <div class="user-roles"></div>
- </td>
- </tr>
- @endforeach
- </table>
-
+ <div class="row">
+ <div class="alert alert-success alert-dismissible" role="alert">
+ <button type="button" class="close" data-dismiss="alert"><span
+ aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+ {{ Session::get("message") }}
</div>
</div>
+ {{ Session::forget("message") }}
+ @endif
</div>
- </div>
+ <div class="container-fluid">
+ <div class="col-md-12">
- <div class="modal fade" id="check-role-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">User Roles</h3>
- </div>
- <div class="modal-body">
- <h4 class="roles-of-user"></h4>
- <div class="roles-load">
- Getting User Roles. Please Wait... <img src="{{URL::to('/')}}/assets/ajax-loader.gif"/>
- </div>
- <div class="roles-list">
- </div>
- <div class="add-roles-block hide">
- <div class="form-group well">
- <label class="control-label">Add a new role to the user</label>
- <select multiple name="new-role" class="new-roles-select" class="form-control">
+ <h1 class="text-center">Users</h1>
+
+ <table class="table table-striped table-condensed">
+ <tr>
+ <th>Username</th>
+ <th>
+ Role :
+ <select onchange="location = this.options[this.selectedIndex].value;">
<option>Select a role</option>
+ <option value="{{URL::to('/')}}/admin/dashboard/users">All</option>
@foreach( (array)$roles as $role)
- <option value="{{$role}}">{{$role}}</option>
+ <option value="{{URL::to('/')}}/admin/dashboard/users?role={{$role}}">{{$role}}</option>
@endforeach
</select>
- <button type="button" class="btn btn-primary add-roles-submit" data-username="">Add Roles</button>
- </div>
- </div>
+ </th>
+ </tr>
+ @foreach( (array)$users as $user)
+ <tr class="user-row">
+ <td>{{ $user }}</td>
+ <td>
+ <button class="button btn btn-default check-roles fade" type="button"
+ data-username="{{$user}}">Check All Roles
+ </button>
+ <div class="user-roles"></div>
+ </td>
+ </tr>
+ @endforeach
+ </table>
+
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="modal fade" id="check-role-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">User Roles</h3>
+ </div>
+ <div class="modal-body">
+ <h4 class="roles-of-user"></h4>
+
+ <div class="roles-load">
+ Getting User Roles. Please Wait... <img src="{{URL::to('/')}}/assets/ajax-loader.gif"/>
+ </div>
+ <div class="roles-list">
</div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn" data-dismiss="modal" value="Close"/>
+ <div class="add-roles-block hide">
+ <div class="form-group well">
+ <label class="control-label">Add a new role to the user</label>
+ <select multiple name="new-role" class="new-roles-select" class="form-control">
+ <option>Select a role</option>
+ @foreach( (array)$roles as $role)
+ <option value="{{$role}}">{{$role}}</option>
+ @endforeach
+ </select>
+ <button type="button" class="btn btn-primary add-roles-submit" data-username="">Add Roles
+ </button>
</div>
</div>
</div>
- <input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn" data-dismiss="modal" value="Close"/>
+ </div>
+ </div>
</div>
+ <input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
</div>
+</div>
- <div class="role-block hide">
- <div class="btn-group" role="group">
- <button type="button" class="btn btn-default role-name" disabled>Role</button>
- <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span></button>
- </div>
+<div class="role-block hide">
+ <div class="btn-group" role="group">
+ <button type="button" class="btn btn-default role-name" disabled>Role</button>
+ <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span></button>
</div>
+</div>
@stop
@section('scripts')
- @parent
- <script>
+@parent
+<script>
- $(".user-row").hover(
- function(){
+ $(".user-row").hover(
+ function () {
$(this).find(".check-roles").addClass("in");
},
- function(){
+ function () {
$(this).find(".check-roles").removeClass("in");
}
);
- $(".check-roles").click( function(){
+ $(".check-roles").click(function () {
//remove disabled roles from previous actions.
- $(".new-roles-select option").each(function()
- {
+ $(".new-roles-select option").each(function () {
$(this).removeAttr("disabled");
});
var userName = $(this).data("username");
$("#check-role-block").modal("show");
- $(".roles-of-user").html( "User : " + userName);
+ $(".roles-of-user").html("User : " + userName);
$(".roles-load").removeClass("hide");
$(".roles-list").addClass("hide");
$(".add-roles-submit").data("username", userName);
@@ -134,62 +139,60 @@
$.ajax({
type: "POST",
url: $(".base-url").val() + "/admin/check-roles",
- data:
- {
- username: userName
+ data: {
+ username: userName
}
})
- .complete(function( data ) {
- roles = JSON.parse( data.responseText );
- roleBlocks = "";
- for( var i=0; i<roles.length; i++)
- {
- //disable roles which user already has.
- $(".new-roles-select option").each(function()
- {
- if( $(this).val() == roles[i])
- $(this).attr("disabled", "disabled");
- else
- $(this).removeAttr("disabled");
- });
- $(".role-block").find(".role-name").html( roles[i]);
- var newRoleBlock = $(".role-block").html();
- roleBlocks += newRoleBlock;
- $(".roles-list").html( roleBlocks);
-
- $(".add-roles-block").removeClass("hide");
- }
- $(".roles-load").addClass("hide");
- $(".roles-list").removeClass("hide");
+ .complete(function (data) {
+ roles = JSON.parse(data.responseText);
+ roleBlocks = "";
+ for (var i = 0; i < roles.length; i++) {
+ //disable roles which user already has.
+ $(".new-roles-select option").each(function () {
+ if ($(this).val() == roles[i])
+ $(this).attr("disabled", "disabled");
+ else
+ $(this).removeAttr("disabled");
+ });
+ $(".role-block").find(".role-name").html(roles[i]);
+ var newRoleBlock = $(".role-block").html();
+ roleBlocks += newRoleBlock;
+ $(".roles-list").html(roleBlocks);
+
+ $(".add-roles-block").removeClass("hide");
+ }
+ $(".roles-load").addClass("hide");
+ $(".roles-list").removeClass("hide");
- });
+ });
- $(".add-roles-submit").click( function(){
+ $(".add-roles-submit").click(function () {
$(this).attr("disabled", "disabled");
$(this).html("<img src='" + $(".base-url").val() + "/ajax-loader.gif'/>");
userName = $(this).data("username");
var rolesToAdd = $(".new-roles-select").val();
- $(".roles-list").find(".role-name").each( function(){
- rolesToAdd.push( $(this).html() );
+ $(".roles-list").find(".role-name").each(function () {
+ rolesToAdd.push($(this).html());
})
$.ajax({
type: "POST",
url: $(".base-url").val() + "/admin/add-roles-to-user",
- data:
- {
+ data: {
add: true,
username: userName,
- roles : rolesToAdd
+ roles: rolesToAdd
},
- success( data){
- console.log( data);
- }
- });
- $(".add-roles-submit").html( "Add Roles");
- $(".add-roles-submit").after("<span class='alert alert-success col-md-12'>Roles have been added</span>");
+ success( data)
+ {
+ console.log(data);
+ }
});
-
+ $(".add-roles-submit").html("Add Roles");
+ $(".add-roles-submit").after("<span class='alert alert-success col-md-12'>Roles have been added</span>");
});
- </script>
+
+ })
+ ;
+</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/application/deployment.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/deployment.blade.php b/app/views/application/deployment.blade.php
index 2cad93b..d33ff9f 100644
--- a/app/views/application/deployment.blade.php
+++ b/app/views/application/deployment.blade.php
@@ -1,180 +1,193 @@
@extends('layout.basic')
@section('page-header')
- @parent
- {{ HTML::style('css/style.css') }}
+@parent
+{{ HTML::style('css/style.css') }}
@stop
@section('content')
<div class="container">
- <div class="col-md-offset-2 col-md-8">
-
- <div class="row">
- <button class="btn btn-default create-app-deployment">Create a new Application Deployment</button>
- </div>
- @if( count( $appDeployments) )
- @if( Session::has("message"))
- <div class="row">
- <div class="alert alert-success alert-dismissible" role="alert">
- <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- {{ Session::get("message") }}
- </div>
- </div>
- {{ Session::forget("message") }}
- @endif
-
- <div class="row">
- <div class="col-md-6">
- <h3>Existing Application Deployments :</h3>
- </div>
- <div class="col-md-6" style="margin-top:3.5%">
- <input type="text" class="col-md-12 filterinput" placeholder="Search by Deployment Id Name" />
- </div>
- </div>
- <div class="panel-group" id="accordion">
- @foreach( $appDeployments as $index => $deployment )
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle collapsed deployment-id" data-toggle="collapse" data-parent="#accordion" href="#collapse-{{$index}}">
- {{ $deployment->appDeploymentId }}
- </a>
- <div class="pull-right col-md-2 deployment-options fade">
- <span class="glyphicon glyphicon-pencil edit-app-deployment" style="cursor:pointer;" data-toggle="modal" data-target="#edit-app-deployment-block" data-deployment-id="{{ $deployment->appDeploymentId }}"></span>
- <span class="glyphicon glyphicon-trash delete-app-deployment" style="cursor:pointer;" data-toggle="modal" data-target="#delete-app-deployment-block" data-deployment-id="{{ $deployment->appDeploymentId }}"></span>
- </div>
- </h4>
- </div>
- <div id="collapse-{{$index}}" class="panel-collapse collapse">
- <div class="panel-body">
- <div class="app-deployment-block">
- @include('partials/deployment-block', array( 'deploymentObject' => $deployment, 'computeResources' => $computeResources, 'modules' => $modules) )
- </div>
- </div>
- </div>
- </div>
- @endforeach
- </div>
- @endif
-
- <div class="load-cmd-ui hide">
- <input name="moduleLoadCmds[]" type="text" class="form-control" placeholder="Module Load Command"/>
- </div>
-
- <div class="lib-prepend-path-ui hide">
- <div class="col-md-12 well">
- <input name="libraryPrependPathName[]" type="text" class="col-md-4" placeholder="Name"/>
- <input name="libraryPrependPathValue[]" type="text" class="col-md-8" placeholder="Value"/>
- </div>
- </div>
-
- <div class="lib-append-path-ui hide">
- <div class="col-md-12 well">
- <input name="libraryAppendPathName[]" type="text" class="col-md-4" placeholder="Name"/>
- <input name="libraryAppendPathValue[]" type="text" class="col-md-8" placeholder="Value"/>
- </div>
- </div>
-
- <div class="environment-ui hide">
- <div class="col-md-12 well">
- <input name="environmentName[]" type="text" class="col-md-4" placeholder="Name"/>
- <input name="environmentValue[]" type="text" class="col-md-8" placeholder="Value"/>
- </div>
- </div>
-
- <div class="pre-job-command-ui hide">
- <div class="col-md-12 well">
- <input name="preJobCommand[]" type="text" class="col-md-12" placeholder="Pre Job Command"/>
- </div>
- </div>
-
- <div class="post-job-command-ui hide">
- <div class="col-md-12 well">
- <input name="postJobCommand[]" type="text" class="col-md-12" placeholder="Post Job Command"/>
- </div>
- </div>
-
- <div class="modal fade" id="edit-app-deployment-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
- <form action="{{URL::to('/')}}/app/deployment-edit" method="POST">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Edit Application Deployment</h3>
- </div>
- <div class="modal-body row">
- <div class="app-deployment-form-content col-md-12">
- </div>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-primary" value="Update"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
-
- <div class="modal fade" id="create-app-deployment-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
- <form action="{{URL::to('/')}}/app/deployment-create" method="POST">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Create Application Deployment</h3>
- </div>
- <div class="modal-body row">
- <div class="col-md-12">
- <div class="create-app-deployment-block">
- @include('partials/deployment-block', array( 'computeResources' => $computeResources, 'modules' => $modules) )
- </div>
- </div>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-primary" value="Create"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
-
- <div class="modal fade" id="delete-app-deployment-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
-
- <form action="{{URL::to('/')}}/app/deployment-delete" method="POST">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Delete Confirmation Application Deployment</h3>
- </div>
- <div class="modal-body">
- <input type="hidden" class="form-control delete-deploymentId" name="appDeploymentId"/>
- Do you really want to delete the Application Deployment - <span class="delete-deployment-id"></span>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-danger" value="Delete"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- </div>
- </div>
- </div>
-
- </form>
-
-
- </div>
- </div>
-
- </div>
+ <div class="col-md-offset-2 col-md-8">
+
+ <div class="row">
+ <button class="btn btn-default create-app-deployment">Create a new Application Deployment</button>
+ </div>
+ @if( count( $appDeployments) )
+ @if( Session::has("message"))
+ <div class="row">
+ <div class="alert alert-success alert-dismissible" role="alert">
+ <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span
+ class="sr-only">Close</span></button>
+ {{ Session::get("message") }}
+ </div>
+ </div>
+ {{ Session::forget("message") }}
+ @endif
+
+ <div class="row">
+ <div class="col-md-6">
+ <h3>Existing Application Deployments :</h3>
+ </div>
+ <div class="col-md-6" style="margin-top:3.5%">
+ <input type="text" class="col-md-12 filterinput" placeholder="Search by Deployment Id Name"/>
+ </div>
+ </div>
+ <div class="panel-group" id="accordion">
+ @foreach( $appDeployments as $index => $deployment )
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle collapsed deployment-id" data-toggle="collapse"
+ data-parent="#accordion" href="#collapse-{{$index}}">
+ {{ $deployment->appDeploymentId }}
+ </a>
+
+ <div class="pull-right col-md-2 deployment-options fade">
+ <span class="glyphicon glyphicon-pencil edit-app-deployment" style="cursor:pointer;"
+ data-toggle="modal" data-target="#edit-app-deployment-block"
+ data-deployment-id="{{ $deployment->appDeploymentId }}"></span>
+ <span class="glyphicon glyphicon-trash delete-app-deployment" style="cursor:pointer;"
+ data-toggle="modal" data-target="#delete-app-deployment-block"
+ data-deployment-id="{{ $deployment->appDeploymentId }}"></span>
+ </div>
+ </h4>
+ </div>
+ <div id="collapse-{{$index}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <div class="app-deployment-block">
+ @include('partials/deployment-block', array( 'deploymentObject' => $deployment,
+ 'computeResources' => $computeResources, 'modules' => $modules) )
+ </div>
+ </div>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ @endif
+
+ <div class="load-cmd-ui hide">
+ <input name="moduleLoadCmds[]" type="text" class="form-control" placeholder="Module Load Command"/>
+ </div>
+
+ <div class="lib-prepend-path-ui hide">
+ <div class="col-md-12 well">
+ <input name="libraryPrependPathName[]" type="text" class="col-md-4" placeholder="Name"/>
+ <input name="libraryPrependPathValue[]" type="text" class="col-md-8" placeholder="Value"/>
+ </div>
+ </div>
+
+ <div class="lib-append-path-ui hide">
+ <div class="col-md-12 well">
+ <input name="libraryAppendPathName[]" type="text" class="col-md-4" placeholder="Name"/>
+ <input name="libraryAppendPathValue[]" type="text" class="col-md-8" placeholder="Value"/>
+ </div>
+ </div>
+
+ <div class="environment-ui hide">
+ <div class="col-md-12 well">
+ <input name="environmentName[]" type="text" class="col-md-4" placeholder="Name"/>
+ <input name="environmentValue[]" type="text" class="col-md-8" placeholder="Value"/>
+ </div>
+ </div>
+
+ <div class="pre-job-command-ui hide">
+ <div class="col-md-12 well">
+ <input name="preJobCommand[]" type="text" class="col-md-12" placeholder="Pre Job Command"/>
+ </div>
+ </div>
+
+ <div class="post-job-command-ui hide">
+ <div class="col-md-12 well">
+ <input name="postJobCommand[]" type="text" class="col-md-12" placeholder="Post Job Command"/>
+ </div>
+ </div>
+
+ <div class="modal fade" id="edit-app-deployment-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+ <form action="{{URL::to('/')}}/app/deployment-edit" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Edit Application Deployment</h3>
+ </div>
+ <div class="modal-body row">
+ <div class="app-deployment-form-content col-md-12">
+ </div>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" value="Update"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+
+ <div class="modal fade" id="create-app-deployment-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+ <form action="{{URL::to('/')}}/app/deployment-create" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Create Application Deployment</h3>
+ </div>
+ <div class="modal-body row">
+ <div class="col-md-12">
+ <div class="create-app-deployment-block">
+ @include('partials/deployment-block', array( 'computeResources' =>
+ $computeResources, 'modules' => $modules) )
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" value="Create"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+
+ <div class="modal fade" id="delete-app-deployment-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+
+ <form action="{{URL::to('/')}}/app/deployment-delete" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Delete Confirmation Application Deployment</h3>
+ </div>
+ <div class="modal-body">
+ <input type="hidden" class="form-control delete-deploymentId" name="appDeploymentId"/>
+ Do you really want to delete the Application Deployment - <span
+ class="delete-deployment-id"></span>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-danger" value="Delete"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+
+ </form>
+
+
+ </div>
+ </div>
+
+ </div>
</div>
@stop
@section('scripts')
- @parent
- {{ HTML::script('js/deployment.js') }}
+@parent
+{{ HTML::script('js/deployment.js') }}
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/application/interface.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/interface.blade.php b/app/views/application/interface.blade.php
index 140a951..1a2d0c2 100644
--- a/app/views/application/interface.blade.php
+++ b/app/views/application/interface.blade.php
@@ -1,165 +1,181 @@
@extends('layout.basic')
@section('page-header')
- @parent
- {{ HTML::style('css/style.css') }}
+@parent
+{{ HTML::style('css/style.css') }}
@stop
@section('content')
<div class="container">
- <div class="col-md-offset-2 col-md-8">
-
- <div class="row">
- <button class="btn btn-default create-app-interface">Create a new Application Interface</button>
- </div>
- @if( count( $appInterfaces) )
- @if( Session::has("message"))
- <div class="row">
- <div class="alert alert-success alert-dismissible" role="alert">
- <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- {{ Session::get("message") }}
- </div>
- </div>
- {{ Session::forget("message") }}
- @endif
- <div class="row">
-
- <div class="col-md-6">
- <h3>Existing Application Interfaces :</h3>
- </div>
- <div class="col-md-6" style="margin-top:3.5%">
- <input type="text" class="col-md-12 filterinput" placeholder="Search by Interface Name" />
- </div>
- </div>
- <div class="panel-group" id="accordion">
- @foreach( $appInterfaces as $index => $interface )
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle collapsed interface-name" data-toggle="collapse" data-parent="#accordion" href="#collapse-{{$index}}">
- {{ $interface->applicationName }}
- </a>
- <div class="pull-right col-md-2 interface-options fade">
- <span class="glyphicon glyphicon-pencil edit-app-interface" style="cursor:pointer;" data-toggle="modal" data-target="#edit-app-interface-block" data-interface-id="{{ $interface->applicationInterfaceId }}"></span>
- <span class="glyphicon glyphicon-trash delete-app-interface" style="cursor:pointer;" data-toggle="modal" data-target="#delete-app-interface-block" data-interface-id="{{ $interface->applicationInterfaceId }}"></span>
- </div>
- </h4>
- </div>
- <div id="collapse-{{$index}}" class="panel-collapse collapse">
- <div class="panel-body">
- <div class="app-interface-block">
- @include('partials/interface-block', array( 'interfaceObject' => $interface, 'dataTypes' => $dataTypes, 'modules' => $modules) )
- </div>
- </div>
- </div>
- </div>
- @endforeach
- </div>
- @endif
-
- </div>
-
- <div class="app-module-block hide">
- <div class="input-group">
- <select name="applicationModules[]" class="app-module-select form-control">
- @foreach( $modules as $index=> $module)
- <option value="{{ $module->appModuleId}}">{{ $module->appModuleName }}</option>
- @endforeach
- </select>
- <span class="input-group-addon remove-app-module" style="cursor:pointer;">x</span>
- </div>
- </div>
-
- <div class="app-input-block hide">
- @include('partials/interface-input-block', array( 'dataTypes' => $dataTypes) )
- </div>
-
- <div class="app-output-block hide">
- @include('partials/interface-output-block', array( 'dataTypes' => $dataTypes) )
- </div>
+ <div class="col-md-offset-2 col-md-8">
+
+ <div class="row">
+ <button class="btn btn-default create-app-interface">Create a new Application Interface</button>
+ </div>
+ @if( count( $appInterfaces) )
+ @if( Session::has("message"))
+ <div class="row">
+ <div class="alert alert-success alert-dismissible" role="alert">
+ <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span
+ class="sr-only">Close</span></button>
+ {{ Session::get("message") }}
+ </div>
+ </div>
+ {{ Session::forget("message") }}
+ @endif
+ <div class="row">
+
+ <div class="col-md-6">
+ <h3>Existing Application Interfaces :</h3>
+ </div>
+ <div class="col-md-6" style="margin-top:3.5%">
+ <input type="text" class="col-md-12 filterinput" placeholder="Search by Interface Name"/>
+ </div>
+ </div>
+ <div class="panel-group" id="accordion">
+ @foreach( $appInterfaces as $index => $interface )
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle collapsed interface-name" data-toggle="collapse"
+ data-parent="#accordion" href="#collapse-{{$index}}">
+ {{ $interface->applicationName }}
+ </a>
+
+ <div class="pull-right col-md-2 interface-options fade">
+ <span class="glyphicon glyphicon-pencil edit-app-interface" style="cursor:pointer;"
+ data-toggle="modal" data-target="#edit-app-interface-block"
+ data-interface-id="{{ $interface->applicationInterfaceId }}"></span>
+ <span class="glyphicon glyphicon-trash delete-app-interface" style="cursor:pointer;"
+ data-toggle="modal" data-target="#delete-app-interface-block"
+ data-interface-id="{{ $interface->applicationInterfaceId }}"></span>
+ </div>
+ </h4>
+ </div>
+ <div id="collapse-{{$index}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <div class="app-interface-block">
+ @include('partials/interface-block', array( 'interfaceObject' => $interface, 'dataTypes' =>
+ $dataTypes, 'modules' => $modules) )
+ </div>
+ </div>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ @endif
+
+ </div>
+
+ <div class="app-module-block hide">
+ <div class="input-group">
+ <select name="applicationModules[]" class="app-module-select form-control">
+ @foreach( $modules as $index=> $module)
+ <option value="{{ $module->appModuleId}}">{{ $module->appModuleName }}</option>
+ @endforeach
+ </select>
+ <span class="input-group-addon remove-app-module" style="cursor:pointer;">x</span>
+ </div>
+ </div>
+
+ <div class="app-input-block hide">
+ @include('partials/interface-input-block', array( 'dataTypes' => $dataTypes) )
+ </div>
+
+ <div class="app-output-block hide">
+ @include('partials/interface-output-block', array( 'dataTypes' => $dataTypes) )
+ </div>
</div>
-<div class="modal fade" id="edit-app-interface-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true" data-backdrop="static">
+<div class="modal fade" id="edit-app-interface-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true" data-backdrop="static">
<div class="modal-dialog">
- <form action="{{URL::to('/')}}/app/interface-edit" method="POST" id="edit-app-interface-form">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h3 class="text-center">Edit Application Interface</h3>
- </div>
- <div class="modal-body row">
- <div class="app-interface-form-content col-md-12">
- </div>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="button" class="submit-edit-app-interface-form btn btn-primary" value="Update"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- <input type="submit" class="btn btn-primary hide really-submit-edit-app-interface-form" value=""/>
- </div>
- </div>
- </div>
+ <form action="{{URL::to('/')}}/app/interface-edit" method="POST" id="edit-app-interface-form">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+ aria-hidden="true">×</span></button>
+ <h3 class="text-center">Edit Application Interface</h3>
+ </div>
+ <div class="modal-body row">
+ <div class="app-interface-form-content col-md-12">
+ </div>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="button" class="submit-edit-app-interface-form btn btn-primary" value="Update"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ <input type="submit" class="btn btn-primary hide really-submit-edit-app-interface-form"
+ value=""/>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
-<div class="modal fade" id="create-app-interface-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true" data-backdrop="static">
+<div class="modal fade" id="create-app-interface-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true" data-backdrop="static">
<div class="modal-dialog">
- <form action="{{URL::to('/')}}/app/interface-create" method="POST" id="create-app-interface-form">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h3 class="text-center">Create Application Interface</h3>
- </div>
- <div class="modal-body row">
- <div class="col-md-12">
- <div class="create-app-interface-block">
- @include('partials/interface-block', array( 'dataTypes' => $dataTypes, 'modules' => $modules) )
- </div>
- </div>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="button" class="btn btn-primary submit-create-app-interface-form" value="Create"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- <input type="submit" class="btn btn-primary hide really-submit-create-app-interface-form" value=""/>
- </div>
- </div>
- </div>
+ <form action="{{URL::to('/')}}/app/interface-create" method="POST" id="create-app-interface-form">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+ aria-hidden="true">×</span></button>
+ <h3 class="text-center">Create Application Interface</h3>
+ </div>
+ <div class="modal-body row">
+ <div class="col-md-12">
+ <div class="create-app-interface-block">
+ @include('partials/interface-block', array( 'dataTypes' => $dataTypes, 'modules' =>
+ $modules) )
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="button" class="btn btn-primary submit-create-app-interface-form" value="Create"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ <input type="submit" class="btn btn-primary hide really-submit-create-app-interface-form"
+ value=""/>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
-<div class="modal fade" id="delete-app-interface-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
+<div class="modal fade" id="delete-app-interface-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
<div class="modal-dialog">
- <form action="{{URL::to('/')}}/app/interface-delete" method="POST">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Delete Confirmation Application Interface</h3>
- </div>
- <div class="modal-body">
- <input type="hidden" class="form-control delete-interfaceid" name="appInterfaceId"/>
- Do you really want to delete the Application Interface - <span class="delete-interface-name"></span>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-danger" value="Delete"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- </div>
- </div>
- </div>
-
- </form>
-
-
- </div>
+ <form action="{{URL::to('/')}}/app/interface-delete" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Delete Confirmation Application Interface</h3>
+ </div>
+ <div class="modal-body">
+ <input type="hidden" class="form-control delete-interfaceid" name="appInterfaceId"/>
+ Do you really want to delete the Application Interface - <span class="delete-interface-name"></span>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-danger" value="Delete"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+
+ </form>
+
+
+ </div>
</div>
@stop
@section('scripts')
- @parent
- {{ HTML::script('js/interface.js') }}
+@parent
+{{ HTML::script('js/interface.js') }}
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/application/module.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/module.blade.php b/app/views/application/module.blade.php
index 006f330..0f635cb 100644
--- a/app/views/application/module.blade.php
+++ b/app/views/application/module.blade.php
@@ -1,189 +1,202 @@
@extends('layout.basic')
@section('page-header')
- @parent
- {{ HTML::style('css/style.css') }}
+@parent
+{{ HTML::style('css/style.css') }}
@stop
@section('content')
<div class="container">
- <div class="col-md-offset-2 col-md-8">
-
- <button class="btn btn-default create-app-module" data-toggle="modal" data-target="#new-app-module-block">Create a new Application Module</button>
-
- @if( count( $modules) )
- @if( Session::has("message"))
- <div class="row">
- <div class="alert alert-success alert-dismissible" role="alert">
- <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- {{ Session::get("message") }}
- </div>
- </div>
- {{ Session::forget("message") }}
- @endif
- <div class="row">
- <div class="col-md-6">
- <h3>Existing Modules :</h3>
- </div>
- <div class="col-md-6" style="margin-top:3.5%">
- <input type="text" class="col-md-12 filterinput" placeholder="Search by Module Name" />
- </div>
- </div>
- <div class="panel-group" id="accordion">
- @foreach( $modules as $index => $module )
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapse-{{$index}}">
- {{ $module->appModuleName }}
- </a>
- <div class="pull-right col-md-2 module-options fade">
- <span class="glyphicon glyphicon-pencil edit-app-module" style="cursor:pointer;" data-toggle="modal" data-target="#edit-app-module-block" data-module-data="{{ htmlentities(json_encode( $module) ) }}"></span>
- <span class="glyphicon glyphicon-trash delete-app-module" style="cursor:pointer;" data-toggle="modal" data-target="#delete-app-module-block" data-module-data="{{ htmlentities(json_encode( $module) ) }}"></span>
- </div>
- </h4>
- </div>
- <div id="collapse-{{$index}}" class="panel-collapse collapse">
- <div class="panel-body">
- {{ $module->appModuleDescription }}
- </div>
- </div>
- </div>
- @endforeach
- </div>
- @endif
-
-
- <div class="modal fade" id="new-app-module-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
-
- <form action="{{URL::to('/')}}/app/module-create" method="POST">
-
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Create a new Application Module</h3>
- </div>
- <div class="modal-body">
- @include('partials/module-block')
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-primary" value="Save"/>
- <input type="reset" class="reset-create-form btn btn-success" value ="Reset"/>
- </div>
- </div>
- </div>
-
- </form>
-
-
- </div>
- </div>
-
- <div class="modal fade" id="edit-app-module-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
-
- <form action="{{URL::to('/')}}/app/module-edit" method="POST">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Edit Application Module</h3>
- </div>
- <div class="modal-body">
- <input type="hidden" class="form-control edit-moduleid" name="appModuleId"/>
- @include('partials/module-block')
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-primary" value="Update"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- </div>
- </div>
- </div>
-
- </form>
-
-
- </div>
- </div>
-
- <div class="modal fade" id="delete-app-module-block" tabindex="-1" role="dialog" aria-labelledby="add-modal" aria-hidden="true">
- <div class="modal-dialog">
-
- <form action="{{URL::to('/')}}/app/module-delete" method="POST">
- <div class="modal-content">
- <div class="modal-header">
- <h3 class="text-center">Delete Confirmation Application Module</h3>
- </div>
- <div class="modal-body">
- <input type="hidden" class="form-control delete-moduleid" name="appModuleId"/>
-
- Do you really want to delete the Application Module - <span class="delete-module-name"></span>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <input type="submit" class="btn btn-danger" value="Delete"/>
- <input type="button" class="btn btn-default" data-dismiss="modal" value ="Cancel"/>
- </div>
- </div>
- </div>
-
- </form>
-
-
- </div>
- </div>
-
-@stop
-
-@section('scripts')
- @parent
- <script type="text/javascript">
-
- $(".panel-title").hover(
- function(){
- $(this).find(".module-options").addClass("in");
- },
- function(){
- $(this).find(".module-options").removeClass("in");
- }
- );
-
- $('.filterinput').keyup(function() {
- var a = $(this).val();
- if (a.length > 0) {
- children = ($("#accordion").children());
-
- var containing = children.filter(function () {
- var regex = new RegExp('\\b' + a, 'i');
- return regex.test($('a', this).text());
- }).slideDown();
- children.not(containing).slideUp();
- } else {
- children.slideDown();
- }
- return false;
- });
-
- $(".create-app-module").click( function(){
- //reset form to clear it out if it got filled by edit modules
- $(".reset-create-form").click();
- })
-
- $(".edit-app-module").click( function(){
- var moduleData = $(this).data("module-data");
- console.log( moduleData);
- $(".edit-name").val( moduleData.appModuleName);
- $(".edit-desc").val( moduleData.appModuleDescription);
- $(".edit-version").val( moduleData.appModuleVersion);
- $(".edit-moduleid").val( moduleData.appModuleId)
- });
-
- $(".delete-app-module").click( function(){
- var moduleData = $(this).data("module-data");
- $(".delete-module-name").html( moduleData.appModuleName);
- $(".delete-moduleid").val( moduleData.appModuleId)
- });
- </script>
-
-@stop
\ No newline at end of file
+ <div class="col-md-offset-2 col-md-8">
+
+ <button class="btn btn-default create-app-module" data-toggle="modal" data-target="#new-app-module-block">Create
+ a new Application Module
+ </button>
+
+ @if( count( $modules) )
+ @if( Session::has("message"))
+ <div class="row">
+ <div class="alert alert-success alert-dismissible" role="alert">
+ <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span
+ class="sr-only">Close</span></button>
+ {{ Session::get("message") }}
+ </div>
+ </div>
+ {{ Session::forget("message") }}
+ @endif
+ <div class="row">
+ <div class="col-md-6">
+ <h3>Existing Modules :</h3>
+ </div>
+ <div class="col-md-6" style="margin-top:3.5%">
+ <input type="text" class="col-md-12 filterinput" placeholder="Search by Module Name"/>
+ </div>
+ </div>
+ <div class="panel-group" id="accordion">
+ @foreach( $modules as $index => $module )
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#accordion"
+ href="#collapse-{{$index}}">
+ {{ $module->appModuleName }}
+ </a>
+
+ <div class="pull-right col-md-2 module-options fade">
+ <span class="glyphicon glyphicon-pencil edit-app-module" style="cursor:pointer;"
+ data-toggle="modal" data-target="#edit-app-module-block"
+ data-module-data="{{ htmlentities(json_encode( $module) ) }}"></span>
+ <span class="glyphicon glyphicon-trash delete-app-module" style="cursor:pointer;"
+ data-toggle="modal" data-target="#delete-app-module-block"
+ data-module-data="{{ htmlentities(json_encode( $module) ) }}"></span>
+ </div>
+ </h4>
+ </div>
+ <div id="collapse-{{$index}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ {{ $module->appModuleDescription }}
+ </div>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ @endif
+
+
+ <div class="modal fade" id="new-app-module-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+
+ <form action="{{URL::to('/')}}/app/module-create" method="POST">
+
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Create a new Application Module</h3>
+ </div>
+ <div class="modal-body">
+ @include('partials/module-block')
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" value="Save"/>
+ <input type="reset" class="reset-create-form btn btn-success" value="Reset"/>
+ </div>
+ </div>
+ </div>
+
+ </form>
+
+
+ </div>
+ </div>
+
+ <div class="modal fade" id="edit-app-module-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+
+ <form action="{{URL::to('/')}}/app/module-edit" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Edit Application Module</h3>
+ </div>
+ <div class="modal-body">
+ <input type="hidden" class="form-control edit-moduleid" name="appModuleId"/>
+ @include('partials/module-block')
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" value="Update"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+
+ </form>
+
+
+ </div>
+ </div>
+
+ <div class="modal fade" id="delete-app-module-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+
+ <form action="{{URL::to('/')}}/app/module-delete" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Delete Confirmation Application Module</h3>
+ </div>
+ <div class="modal-body">
+ <input type="hidden" class="form-control delete-moduleid" name="appModuleId"/>
+
+ Do you really want to delete the Application Module - <span
+ class="delete-module-name"></span>
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-danger" value="Delete"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+
+ </form>
+
+
+ </div>
+ </div>
+
+ @stop
+
+ @section('scripts')
+ @parent
+ <script type="text/javascript">
+
+ $(".panel-title").hover(
+ function () {
+ $(this).find(".module-options").addClass("in");
+ },
+ function () {
+ $(this).find(".module-options").removeClass("in");
+ }
+ );
+
+ $('.filterinput').keyup(function () {
+ var a = $(this).val();
+ if (a.length > 0) {
+ children = ($("#accordion").children());
+
+ var containing = children.filter(function () {
+ var regex = new RegExp('\\b' + a, 'i');
+ return regex.test($('a', this).text());
+ }).slideDown();
+ children.not(containing).slideUp();
+ } else {
+ children.slideDown();
+ }
+ return false;
+ });
+
+ $(".create-app-module").click(function () {
+ //reset form to clear it out if it got filled by edit modules
+ $(".reset-create-form").click();
+ })
+
+ $(".edit-app-module").click(function () {
+ var moduleData = $(this).data("module-data");
+ console.log(moduleData);
+ $(".edit-name").val(moduleData.appModuleName);
+ $(".edit-desc").val(moduleData.appModuleDescription);
+ $(".edit-version").val(moduleData.appModuleVersion);
+ $(".edit-moduleid").val(moduleData.appModuleId)
+ });
+
+ $(".delete-app-module").click(function () {
+ var moduleData = $(this).data("module-data");
+ $(".delete-module-name").html(moduleData.appModuleName);
+ $(".delete-moduleid").val(moduleData.appModuleId)
+ });
+ </script>
+
+ @stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/emails/auth/reminder.blade.php
----------------------------------------------------------------------
diff --git a/app/views/emails/auth/reminder.blade.php b/app/views/emails/auth/reminder.blade.php
index aebea9e..59cf733 100755
--- a/app/views/emails/auth/reminder.blade.php
+++ b/app/views/emails/auth/reminder.blade.php
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html lang="en-US">
- <head>
- <meta charset="utf-8">
- </head>
- <body>
- <h2>Password Reset</h2>
+<head>
+ <meta charset="utf-8">
+</head>
+<body>
+<h2>Password Reset</h2>
- <div>
- To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.<br/>
- This link will expire in {{ Config::get('auth.reminder.expire', 60) }} minutes.
- </div>
- </body>
+<div>
+ To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.<br/>
+ This link will expire in {{ Config::get('auth.reminder.expire', 60) }} minutes.
+</div>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/experiment/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/browse.blade.php b/app/views/experiment/browse.blade.php
index 8e27b85..105a65d 100755
--- a/app/views/experiment/browse.blade.php
+++ b/app/views/experiment/browse.blade.php
@@ -3,45 +3,46 @@
@section('content')
<div class="container" style="max-width: 750px;">
-<h1>Browse Experiments</h1>
+ <h1>Browse Experiments</h1>
-<?php
+ <?php
-if (isset( $expContainer))
-{
-?>
+ if (isset($expContainer))
+ {
+ ?>
<!-- Pagination handling-->
<form id="paginationForm" action="{{URL::to('/')}}/experiment/browse" method="post" class="form-inline" role="form">
<div class="pull-right btn-toolbar" style="padding-bottom: 5px">
<?php
- if($pageNo!=1){
+ if ($pageNo != 1) {
echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="prev" value="Previous"/>';
}
- if(sizeof($expContainer)>0){
+ if (sizeof($expContainer) > 0) {
echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="next" value="Next"/>';
}
?>
</div>
<div class="pull-left">
- <?php if (sizeof($expContainer) != 0) echo 'Showing results from ' . strval(($pageNo-1)*$limit + 1)
- . ' to ' . strval(min($pageNo*$limit, ($pageNo-1)*$limit + sizeof($expContainer))); ?>
+ <?php if (sizeof($expContainer) != 0) echo 'Showing results from ' . strval(($pageNo - 1) * $limit + 1)
+ . ' to ' . strval(min($pageNo * $limit, ($pageNo - 1) * $limit + sizeof($expContainer))); ?>
</div>
<input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/>
+
<div style="clear: both"></div>
</form>
-<?php
+ <?php
if (sizeof($expContainer) == 0)
{
- if($pageNo==1){
- Utilities::print_warning_message('No results found. Please try again.');
- }else{
- Utilities::print_warning_message('No more results found.');
+ if ($pageNo == 1) {
+ CommonUtilities::print_warning_message('No results found. Please try again.');
+ } else {
+ CommonUtilities::print_warning_message('No more results found.');
}
}
else
{
-?>
+ ?>
<div id="re" class="table-responsive">
<table class="table">
<tr>
@@ -51,133 +52,122 @@ if (isset( $expContainer))
<!--<th>Resource</th>-->
<th>Creation Time</th>
<th>Status</th>
-<!-- <select class="form-control select-status">-->
-<!-- <option value="ALL">Status</option>-->
-<!-- @foreach( $expStates as $index => $state)-->
-<!-- <option value="{{ $state }}">{{ $state }}</option>-->
-<!-- @endforeach-->
-<!-- </select>-->
-<!-- </th>-->
+ <!-- <select class="form-control select-status">-->
+ <!-- <option value="ALL">Status</option>-->
+ <!-- @foreach( $expStates as $index => $state)-->
+ <!-- <option value="{{ $state }}">{{ $state }}</option>-->
+ <!-- @endforeach-->
+ <!-- </select>-->
+ <!-- </th>-->
</tr>
-
-
-<?php
- foreach ($expContainer as $experiment)
- {
- $description = $experiment['experiment']->description;
- if (strlen($description) > 17) // 17 is arbitrary
- {
- $description = substr($experiment['experiment']->description, 0, 17) . '<span class="text-muted">...</span>';
- }
- echo '<tr>';
- $addEditOption="";
- if( $experiment['expValue']['editable'])
- $addEditOption = '<a href="'. URL::to('/') . '/experiment/edit?expId=' . $experiment['experiment']->experimentID . '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>';
-
- echo '<td>' . $experiment['experiment']->name . $addEditOption . '</td>';
-
- echo '<td>' . $experiment['expValue']['applicationInterface']->applicationName . '</td>';
-
- echo '<td>' . $description . '</td>';
-
- //echo "<td>$computeResource->hostName</td>";
- echo '<td class="time" unix-time="' . $experiment['experiment']->creationTime/1000 . '"></td>';
-
-
- switch ($experiment['expValue']['experimentStatusString'])
- {
- case 'CANCELING':
- case 'CANCELED':
- case 'UNKNOWN':
- $textClass = 'text-warning';
- break;
- case 'FAILED':
- $textClass = 'text-danger';
- break;
- case 'COMPLETED':
- $textClass = 'text-success';
- break;
- default:
- $textClass = 'text-info';
- break;
- }
- ?>
- <td>
- <a class="<?php echo $textClass; ?>" href="{{ URL::to('/') }}/experiment/summary?expId=<?php echo $experiment['experiment']->experimentID; ?>">
- <?php echo $experiment['expValue']['experimentStatusString']; ?>
- </a>
- </td>
+ <?php
+ foreach ($expContainer as $experiment) {
+ $description = $experiment['experiment']->description;
+ if (strlen($description) > 17) // 17 is arbitrary
+ {
+ $description = substr($experiment['experiment']->description, 0, 17) . '<span class="text-muted">...</span>';
+ }
- </tr>
+ echo '<tr>';
+ $addEditOption = "";
+ if ($experiment['expValue']['editable'])
+ $addEditOption = '<a href="' . URL::to('/') . '/experiment/edit?expId=' . $experiment['experiment']->experimentID . '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>';
- <?php
- }
+ echo '<td>' . $experiment['experiment']->name . $addEditOption . '</td>';
- echo '
- </table>
- </div>
- ';
- }
-}
-?>
+ echo '<td>' . $experiment['expValue']['applicationInterface']->applicationName . '</td>';
+
+ echo '<td>' . $description . '</td>';
+
+ //echo "<td>$computeResource->hostName</td>";
+ echo '<td class="time" unix-time="' . $experiment['experiment']->creationTime / 1000 . '"></td>';
+
+
+ switch ($experiment['expValue']['experimentStatusString']) {
+ case 'CANCELING':
+ case 'CANCELED':
+ case 'UNKNOWN':
+ $textClass = 'text-warning';
+ break;
+ case 'FAILED':
+ $textClass = 'text-danger';
+ break;
+ case 'COMPLETED':
+ $textClass = 'text-success';
+ break;
+ default:
+ $textClass = 'text-info';
+ break;
+ }
+
+ ?>
+ <td>
+ <a class="<?php echo $textClass; ?>"
+ href="{{ URL::to('/') }}/experiment/summary?expId=<?php echo $experiment['experiment']->experimentID; ?>">
+ <?php echo $experiment['expValue']['experimentStatusString']; ?>
+ </a>
+ </td>
+ </tr>
+ <?php
+ }
+ }
+ }
+ ?>
+ </table>
+ </div>
</div>
@stop
@section('scripts')
- @parent
- {{ HTML::script('js/time-conversion.js')}}
- <script type="text/javascript">
+@parent
+{{ HTML::script('js/time-conversion.js')}}
+<script type="text/javascript">
- $(document).ready( function(){
+ $(document).ready(function () {
- /* script to make status select work on the UI side itself. */
+ /* script to make status select work on the UI side itself. */
- $(".select-status").on("change", function(){
- selectedStatus = this.value;
+ $(".select-status").on("change", function () {
+ selectedStatus = this.value;
- if( selectedStatus == "ALL")
- {
- $("table tr").slideDown();
- }
- else
- {
- $("table tr").each(function(index) {
- if (index != 0) {
-
- $row = $(this);
-
- var status = $.trim( $row.find("td:last").text() );
- if (status == selectedStatus )
- {
- $(this).slideDown();
- }
- else {
- $(this).slideUp();
- }
+ if (selectedStatus == "ALL") {
+ $("table tr").slideDown();
+ }
+ else {
+ $("table tr").each(function (index) {
+ if (index != 0) {
+
+ $row = $(this);
+
+ var status = $.trim($row.find("td:last").text());
+ if (status == selectedStatus) {
+ $(this).slideDown();
}
- });
- }
- });
+ else {
+ $(this).slideUp();
+ }
+ }
+ });
+ }
});
+ });
- function changeInputVisibility( selectedStatus)
- {
- if( selectedStatus == "creation-time")
- {
+ function changeInputVisibility(selectedStatus) {
+ if (selectedStatus == "creation-time") {
$(".search-text-block").addClass("hide");
$(".select-dates").removeClass("hide");
$("#search-value").removeAttr("required");
}
- else
- {
+ else {
$(".search-text-block").removeClass("hide");
$(".select-dates").addClass("hide");
$("#search-value").attr("required");
}
}
- </script>
+</script>
+
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/experiment/create-complete.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/create-complete.blade.php b/app/views/experiment/create-complete.blade.php
index d5d944d..06e8f31 100644
--- a/app/views/experiment/create-complete.blade.php
+++ b/app/views/experiment/create-complete.blade.php
@@ -1,13 +1,14 @@
@extends('layout.basic')
@section('page-header')
- @parent
+@parent
@stop
@section('content')
<div class="col-md-offset-3 col-md-6">
-
+
<h1>Create a new experiment</h1>
+
<form action="{{URL::to('/')}}/experiment/create" method="POST" role="form" enctype="multipart/form-data">
<input type="hidden" name="experiment-name" value="{{$expInputs['experimentName']}}">
@@ -15,19 +16,22 @@
<input type="hidden" name="project" value="{{$expInputs['project']}}">
<input type="hidden" name="application" value="{{$expInputs['application']}}">
- @include('partials/experiment-inputs', array("expInputs" => $expInputs, "queueDefaults" => $expInputs['queueDefaults']) )
+ @include('partials/experiment-inputs', array("expInputs" => $expInputs, "queueDefaults" =>
+ $expInputs['queueDefaults']) )
<div class="form-group btn-toolbar">
<div class="btn-group">
<button name="save" type="submit" class="btn btn-primary" value="Save">Save</button>
- <button name="launch" type="submit" class="btn btn-success" id="expLaunch" value="Save and launch">Save and launch</button>
+ <button name="launch" type="submit" class="btn btn-success" id="expLaunch" value="Save and launch">Save
+ and launch
+ </button>
</div>
-
+
<a href="{{URL::to('/')}}/experiment/create" class="btn btn-default" role="button">Start over</a>
</div>
-
+
</form>
-
+
</div>
@@ -35,50 +39,47 @@
@stop
@section('scripts')
- @parent
- <script>
- $('.file-input').bind('change', function() {
-
- var inputFileSize = Math.round( this.files[0].size/(1024*1024) );
- if( inputFileSize > $("#allowedFileSize").val())
- {
- alert( "The input file size is greater than the allowed file size (" + $("#allowedFileSize").val() + " MB) in a form. Please upload another file.");
+@parent
+<script>
+ $('.file-input').bind('change', function () {
+
+ var inputFileSize = Math.round(this.files[0].size / (1024 * 1024));
+ if (inputFileSize > $("#allowedFileSize").val()) {
+ alert("The input file size is greater than the allowed file size (" + $("#allowedFileSize").val() + " MB) in a form. Please upload another file.");
$(this).val("");
}
});
- $("#enableEmail").change( function(){
- if( this.checked)
- {
+ $("#enableEmail").change(function () {
+ if (this.checked) {
$("#emailAddresses").attr("required", "required");
$(this).parent().children(".emailSection").removeClass("hide");
}
- else
- {
+ else {
$(this).parent().children(".emailSection").addClass("hide");
$("#emailAddresses").removeAttr("required");
}
});
- $(".addEmail").click( function(){
+ $(".addEmail").click(function () {
var emailInput = $(this).parent().find("#emailAddresses").clone();
emailInput.removeAttr("id").removeAttr("required").val("").appendTo(".emailAddresses");
});
- $("#compute-resource").change( function(){
+ $("#compute-resource").change(function () {
var crId = $(this).val();
$(".loading-img ").removeClass("hide");
$.ajax({
url: '../experiment/getQueueView',
type: 'get',
data: {crId: crId},
- success: function(data) {
- $(".queue-view").html( data);
+ success: function (data) {
+ $(".queue-view").html(data);
$(".loading-img ").addClass("hide");
}
});
});
- </script>
+</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/experiment/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/create.blade.php b/app/views/experiment/create.blade.php
index 52873f1..1318460 100755
--- a/app/views/experiment/create.blade.php
+++ b/app/views/experiment/create.blade.php
@@ -1,17 +1,17 @@
@extends('layout.basic')
@section('page-header')
- @parent
+@parent
@stop
@section('content')
<div class="col-md-offset-3 col-md-6">
-
+
<h1>Create a new experiment</h1>
<form action="{{URL::to('/')}}/experiment/create" method="POST" role="form" enctype="multipart/form-data">
- <?php
+ <?php
$disabled = '';
$experimentName = '';
@@ -21,33 +21,35 @@
$echo = '';
$wrf = '';
- ?>
+ ?>
<div class="form-group required">
<label for="experiment-name" class="control-label">Experiment Name</label>
- <input type="text" class="form-control" name="experiment-name" id="experiment-name" placeholder="Enter experiment name" autofocus required="required">
+ <input type="text" class="form-control" name="experiment-name" id="experiment-name"
+ placeholder="Enter experiment name" autofocus required="required">
</div>
<div class="form-group">
<label for="experiment-description">Experiment Description</label>
- <textarea class="form-control" name="experiment-description" id="experiment-description" placeholder="Optional: Enter a short description of the experiment"></textarea>
+ <textarea class="form-control" name="experiment-description" id="experiment-description"
+ placeholder="Optional: Enter a short description of the experiment"></textarea>
</div>
<div class="form-group required">
<label for="project" class="control-label">Project</label>
- {{ Utilities::create_project_select($project, !$disabled) }}
+ {{ ProjectUtilities::create_project_select($project, !$disabled) }}
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="application">Application</label>
- {{ Utilities::create_application_select($application, !$disabled) }}
+ {{ ExperimentUtilities::create_application_select($application, !$disabled) }}
</div>
<div class="btn-toolbar">
<input name="continue" type="submit" class="btn btn-primary" value="Continue">
<input name="clear" type="reset" class="btn btn-default" value="Reset values">
- </div>
+ </div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fbd9289/app/views/experiment/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/edit.blade.php b/app/views/experiment/edit.blade.php
index 8eb759a..b4ee28c 100755
--- a/app/views/experiment/edit.blade.php
+++ b/app/views/experiment/edit.blade.php
@@ -1,7 +1,7 @@
@extends('layout.basic')
@section('page-header')
- @parent
+@parent
@stop
@section('content')
@@ -16,25 +16,27 @@
<div class="container">
- <div class="col-md-offset-3 col-md-6">
- <h1>Edit Cloned Experiment</h1>
+ <div class="col-md-offset-3 col-md-6">
+ <h1>Edit Cloned Experiment</h1>
- <form action="{{URL::to('/')}}/experiment/edit" method="POST" role="form" enctype="multipart/form-data">
- <input type="hidden" name="expId" value="<?php echo Input::get('expId');?>"/>
+ <form action="{{URL::to('/')}}/experiment/edit" method="POST" role="form" enctype="multipart/form-data">
+ <input type="hidden" name="expId" value="<?php echo Input::get('expId'); ?>"/>
- @include('partials/experiment-inputs')
+ @include('partials/experiment-inputs')
- <div class="btn-toolbar">
- <div class="btn-group">
- <input name="save" type="submit" class="btn btn-primary" value="Save" <?php if(!$expInputs['expVal']['editable']) echo 'disabled' ?>>
- <input name="launch" type="submit" class="btn btn-success" value="Save and launch" <?php if(!$expInputs['expVal']['editable']) echo 'disabled' ?>>
+ <div class="btn-toolbar">
+ <div class="btn-group">
+ <input name="save" type="submit" class="btn btn-primary"
+ value="Save" <?php if (!$expInputs['expVal']['editable']) echo 'disabled' ?>>
+ <input name="launch" type="submit" class="btn btn-success"
+ value="Save and launch" <?php if (!$expInputs['expVal']['editable']) echo 'disabled' ?>>
+ </div>
</div>
- </div>
- </form>
- </div>
+ </form>
+ </div>
</div>
@@ -42,36 +44,33 @@
@section('scripts')
- @parent
- <script>
- $('.file-input').bind('change', function() {
-
- var inputFileSize = Math.round( this.files[0].size/(1024*1024) );
- if( inputFileSize > $("#allowedFileSize").val())
- {
- alert( "The input file size is greater than the allowed file size (" + $("#allowedFileSize").val() + " MB) in a form. Please upload another file.");
+@parent
+<script>
+ $('.file-input').bind('change', function () {
+
+ var inputFileSize = Math.round(this.files[0].size / (1024 * 1024));
+ if (inputFileSize > $("#allowedFileSize").val()) {
+ alert("The input file size is greater than the allowed file size (" + $("#allowedFileSize").val() + " MB) in a form. Please upload another file.");
$(this).val("");
}
});
- $("#enableEmail").change( function(){
- if( this.checked)
- {
+ $("#enableEmail").change(function () {
+ if (this.checked) {
$("#emailAddresses").attr("required", "required");
- $(this).parent().children(".emailSection").removeClass("hide");
+ $(this).parent().children(".emailSection").removeClass("hide");
}
- else
- {
- $(this).parent().children(".emailSection").addClass("hide");
+ else {
+ $(this).parent().children(".emailSection").addClass("hide");
$("#emailAddresses").removeAttr("required");
}
});
- $(".addEmail").click( function(){
- var emailInput = $(this).parent().find("#emailAddresses").clone();
- emailInput.removeAttr("id").removeAttr("required").val("").appendTo(".emailAddresses");
+ $(".addEmail").click(function () {
+ var emailInput = $(this).parent().find("#emailAddresses").clone();
+ emailInput.removeAttr("id").removeAttr("required").val("").appendTo(".emailAddresses");
});
- </script>
+</script>
@stop
\ No newline at end of file