You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/01/20 16:37:35 UTC
airavata-php-gateway git commit: AIRAVATA-2223 Fix sharing disabled
bugs
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop fd292859d -> b68d9a8d8
AIRAVATA-2223 Fix sharing disabled bugs
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/b68d9a8d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b68d9a8d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b68d9a8d
Branch: refs/heads/develop
Commit: b68d9a8d8038dbf03e246fa4b4cb2069f6f28999
Parents: fd29285
Author: Marcus Christie <ma...@iu.edu>
Authored: Fri Jan 20 11:35:07 2017 -0500
Committer: Marcus Christie <ma...@iu.edu>
Committed: Fri Jan 20 11:35:07 2017 -0500
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 34 ++-
app/controllers/ProjectController.php | 36 ++--
app/libraries/ExperimentUtilities.php | 3 +-
app/libraries/ProjectUtilities.php | 10 +-
.../experiment/no-sharing-browse.blade.php | 214 -------------------
.../no-sharing-create-complete.blade.php | 40 ++--
app/views/experiment/no-sharing-edit.blade.php | 32 ++-
.../partials/experiment-container.blade.php | 6 +-
app/views/partials/experiment-inputs.blade.php | 2 +
app/views/project/browse.blade.php | 4 +-
app/views/project/no-sharing-browse.blade.php | 146 -------------
app/views/project/no-sharing-create.blade.php | 4 +-
app/views/project/no-sharing-edit.blade.php | 4 +-
app/views/project/no-sharing-summary.blade.php | 2 +-
14 files changed, 93 insertions(+), 444 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index cb71bfb..29004d1 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -428,29 +428,23 @@ class ExperimentController extends BaseController
($pageNo - 1) * $this->limit);
$experimentStates = ExperimentUtilities::getExpStates();
- if(Config::get('pga_config.airavata')["data-sharing-enabled"]){
- $can_write = array();
- foreach ($expContainer as $experiment) {
+ $can_write = array();
+ foreach ($expContainer as $experiment) {
+ if(Config::get('pga_config.airavata')["data-sharing-enabled"]){
$can_write[$experiment['experiment']->experimentId] = SharingUtilities::userCanWrite(Session::get("username"), $experiment['experiment']->experimentId, ResourceType::EXPERIMENT);
+ } else {
+ $can_write[$experiment['experiment']->experimentId] = true;
}
-
- return View::make('experiment/browse', array(
- 'input' => Input::all(),
- 'pageNo' => $pageNo,
- 'limit' => $this->limit,
- 'expStates' => $experimentStates,
- 'expContainer' => $expContainer,
- 'can_write' => $can_write
- ));
- }else{
- return View::make('experiment/no-sharing-browse', array(
- 'input' => Input::all(),
- 'pageNo' => $pageNo,
- 'limit' => $this->limit,
- 'expStates' => $experimentStates,
- 'expContainer' => $expContainer
- ));
}
+
+ return View::make('experiment/browse', array(
+ 'input' => Input::all(),
+ 'pageNo' => $pageNo,
+ 'limit' => $this->limit,
+ 'expStates' => $experimentStates,
+ 'expContainer' => $expContainer,
+ 'can_write' => $can_write
+ ));
}
/**
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/controllers/ProjectController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ProjectController.php b/app/controllers/ProjectController.php
index 0322820..7651b25 100755
--- a/app/controllers/ProjectController.php
+++ b/app/controllers/ProjectController.php
@@ -198,32 +198,22 @@ class ProjectController extends BaseController
$projects = ProjectUtilities::get_all_user_accessible_projects_with_pagination($this->limit, ($pageNo - 1) * $this->limit);
}
- if(Config::get('pga_config.airavata')["data-sharing-enabled"]){
- $can_write = array();
- $user = Session::get("username");
- foreach($projects as $project) {
- if (SharingUtilities::userCanWrite($user, $project->projectID, ResourceType::PROJECT)) {
- $can_write[$project->projectID] = true;
- }
- else {
- $can_write[$project->projectID] = false;
- }
+ $can_write = array();
+ $user = Session::get("username");
+ foreach($projects as $project) {
+ if(Config::get('pga_config.airavata')["data-sharing-enabled"]){
+ $can_write[$project->projectID] = SharingUtilities::userCanWrite($user, $project->projectID, ResourceType::PROJECT);
+ } else {
+ $can_write[$project->projectID] = true;
}
-
- return View::make('project/browse', array(
- 'pageNo' => $pageNo,
- 'limit' => $this->limit,
- 'projects' => $projects,
- 'can_write' => $can_write
- ));
- }else{
- return View::make('project/no-sharing-browse', array(
- 'pageNo' => $pageNo,
- 'limit' => $this->limit,
- 'projects' => $projects
- ));
}
+ return View::make('project/browse', array(
+ 'pageNo' => $pageNo,
+ 'limit' => $this->limit,
+ 'projects' => $projects,
+ 'can_write' => $can_write
+ ));
}
/**
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 47a0c0e..12718f1 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -865,8 +865,6 @@ class ExperimentUtilities
$experiment = ExperimentUtilities::assemble_experiment();
$expId = null;
- $share = $_POST['share-settings'];
-
try {
if ($experiment) {
$expId = Airavata::createExperiment(Session::get('authz-token'), Session::get("gateway_id"), $experiment);
@@ -889,6 +887,7 @@ class ExperimentUtilities
}
if(Config::get('pga_config.airavata')["data-sharing-enabled"] && $expId){
+ $share = $_POST['share-settings'];
ExperimentUtilities::share_experiment($expId, json_decode($share));
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index d5fb338..a02ae69 100755
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -61,10 +61,14 @@ class ProjectUtilities
{
$writeableProjects = array();
$userProjects = ProjectUtilities::get_all_user_projects($gatewayId, $username);
- foreach($userProjects as $project) {
- if (SharingUtilities::userCanWrite($username, $project->projectID, ResourceType::PROJECT)) {
- $writeableProjects[] = $project;
+ if (Config::get('pga_config.airavata')["data-sharing-enabled"]){
+ foreach($userProjects as $project) {
+ if (SharingUtilities::userCanWrite($username, $project->projectID, ResourceType::PROJECT)) {
+ $writeableProjects[] = $project;
+ }
}
+ } else {
+ $writeableProjects = $userProjects;
}
return $writeableProjects;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/experiment/no-sharing-browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/no-sharing-browse.blade.php b/app/views/experiment/no-sharing-browse.blade.php
deleted file mode 100755
index 09e9929..0000000
--- a/app/views/experiment/no-sharing-browse.blade.php
+++ /dev/null
@@ -1,214 +0,0 @@
-@extends('layout.basic')
-
-@section('page-header')
-@parent
-{{ HTML::style('css/datetimepicker.css')}}
-
-@stop
-
-@section('content')
-
-<div class="container" style="max-width: 80%;">
- <form action="{{URL::to('/')}}/experiment/browse" method="post" class="form-inline" role="form">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3>Search for Experiments</h3>
- </div>
- <div class="panel-body">
- <div class="form-group">
- <label for="search-key">Search by</label>
- <select class="form-control" name="search-key" id="search-key">
- <?php
-
- // set up options for select input
- $values = array('experiment-name', 'experiment-description', 'application', 'creation-time');
- $labels = array('Experiment Name', 'Experiment Description', 'Application', 'Creation Time');
- $disabled = array('', '', '', '');
-
- ExperimentUtilities::create_options($values, $labels, $disabled);
-
- ?>
- </select>
- </div>
-
- <div class="form-group search-text-block">
- <label for="search-value">for</label>
- <input type="search" class="form-control" name="search-value" id="search-value" placeholder="value"
- value="<?php if (isset($_POST['search-value'])) echo $_POST['search-value'] ?>">
- </div>
-
- <select name="status-type" class="form-control select-status">
- <option value="ALL">Status</option>
- <?php
- foreach ($expStates as $index => $state) {
- if (isset($input) && isset($input["status-type"]) && $state == $input["status-type"]) {
- echo '<option value="' . $state . '" selected>' . $state . '</option>';
- } else {
- echo '<option value="' . $state . '">' . $state . '</option>';
- }
- }
- ?>
- </select>
-
- <div class="container select-dates hide">
- <div class="col-md-12">
- Select dates between which you want to search for experiments.
- </div>
- <div class="col-sm-8" style="height:75px;">
- <div class='col-md-6'>
- <div class="form-group">
- <div class='input-group date' id='datetimepicker9'>
- <input type='text' class="form-control" placeholder="From Date" name="from-date"
- value="<?php if (isset($_POST['from-date'])) echo $_POST['from-date'] ?>"/>
- <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
- </span>
- </div>
- </div>
- </div>
- <div class='col-md-6'>
- <div class="form-group">
- <div class='input-group date' id='datetimepicker10'>
- <input type='text' class="form-control" placeholder="To Date" name="to-date"
- value="<?php if (isset($_POST['to-date'])) echo $_POST['to-date'] ?>"/>
- <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
- </span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <button name="search" type="submit" class="btn btn-primary pull-right" value="Search"><span
- class="glyphicon glyphicon-search"></span> Search
- </button>
- <p class="help-block">You can use * as a wildcard character. Tip: search for * alone to retrieve all of your
- experiments.</p>
-
- </div>
- </div>
-
- <!-- Pagination Handling -->
- <?php
- if (isset($expContainer)) {
- ?>
- <div class="pull-right btn-toolbar" style="padding-bottom: 5px">
- <?php
- if ($pageNo != 1) {
- echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="prev" value="Previous"/>';
- }
- 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 experiments 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>
- <?php
- }
- ?>
- </form>
-
- @include('partials/experiment-container')
-
-</div>
-
-@stop
-
-@section('scripts')
-@parent
-{{ HTML::script('js/moment.js')}}
-{{ HTML::script('js/datetimepicker-3.1.3.js')}}
-
-<script type="text/javascript">
-
- $(document).ready(function () {
-
-//------------------------Commenting Client Side filtering--------------------------------------
-// /* script to make status select work on the UI side itself. */
-//
-// $(".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();
-// }
-// }
-// });
-// }
-// });
-
- /* making datetimepicker work for exp search */
-
- $('#datetimepicker9').datetimepicker({
- pick12HourFormat: false
- });
- $('#datetimepicker10').datetimepicker({
- pick12HourFormat: false
- });
- $("#datetimepicker9").on("dp.change", function (e) {
- $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date);
-
- //hack to close calendar on selecting date
- $(this).find(".glyphicon-calendar").click();
- });
- $("#datetimepicker10").on("dp.change", function (e) {
- $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date);
-
- //hack to close calendar on selecting date
- $(this).find(".glyphicon-calendar").click();
- });
-
- /* selecting creation time */
- $("#search-key").on("change", function () {
- if (this.value == "creation-time") {
- $(".search-text-block").addClass("hide");
- $(".select-dates").removeClass("hide");
- $("#search-value").removeAttr("required");
-
- }
- else {
- $(".search-text-block").removeClass("hide");
- $(".select-dates").addClass("hide");
- $("#search-value").attr("required");
- }
- });
-
- changeInputVisibility($("#search-key").val());
-
- });
-
- function changeInputVisibility(selectedStatus) {
- if (selectedStatus == "creation-time") {
- $(".search-text-block").addClass("hide");
- $(".select-dates").removeClass("hide");
- $("#search-value").removeAttr("required");
-
- }
- else {
- $(".search-text-block").removeClass("hide");
- $(".select-dates").addClass("hide");
- $("#search-value").attr("required");
- }
- }
-</script>
-@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/experiment/no-sharing-create-complete.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/no-sharing-create-complete.blade.php b/app/views/experiment/no-sharing-create-complete.blade.php
index 106a7e1..3fef1b1 100755
--- a/app/views/experiment/no-sharing-create-complete.blade.php
+++ b/app/views/experiment/no-sharing-create-complete.blade.php
@@ -41,6 +41,7 @@
@section('scripts')
@parent
+{{ HTML::script('js/util.js') }}
<script>
var warn = true;
@@ -51,12 +52,14 @@
$('.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.");
+ var allowedFileSize = $("#allowedFileSize").val();
+ var tooLargeFilenames = util.validateMaxUploadFileSize(this.files, allowedFileSize);
+
+ if (tooLargeFilenames.length > 0) {
+ var singleOrMultiple = tooLargeFilenames.length === 1 ? " the file [" : " each of the files [";
+ alert("The size of " + singleOrMultiple + tooLargeFilenames.join(", ") + "] is greater than the allowed file size (" + allowedFileSize + " MB) in a form. Please upload another file.");
$(this).val("");
}
-
});
$("#enableEmail").change(function () {
@@ -99,19 +102,22 @@
//Selecting the first option as the default
$( document ).ready(function() {
- var crId = $("#compute-resource").val();
- $(".loading-img ").removeClass("hide");
- $.ajax({
- url: '../experiment/getQueueView',
- type: 'get',
- data: {crId: crId},
- success: function (data) {
- $(".queue-view").html(data);
- $(".loading-img ").addClass("hide");
- },error : function(data){
- $(".loading-img ").addClass("hide");
- }
- });
+ var $cr = $("#compute-resource");
+ var crId = $cr.val();
+ if ($cr.children("option").size() === 1 && crId !== "") {
+ $(".loading-img ").removeClass("hide");
+ $.ajax({
+ url: '../experiment/getQueueView',
+ type: 'get',
+ data: {crId: crId},
+ success: function (data) {
+ $(".queue-view").html(data);
+ $(".loading-img ").addClass("hide");
+ },error : function(data){
+ $(".loading-img ").addClass("hide");
+ }
+ });
+ }
});
//Setting the file input view JS code
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/experiment/no-sharing-edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/no-sharing-edit.blade.php b/app/views/experiment/no-sharing-edit.blade.php
index 68d17be..10fa19a 100755
--- a/app/views/experiment/no-sharing-edit.blade.php
+++ b/app/views/experiment/no-sharing-edit.blade.php
@@ -16,6 +16,12 @@
<div class="container">
+ @if (Session::has("error-message"))
+ <div class="alert alert-danger">
+ {{{ Session::get("error-message") }}}
+ </div>
+ @endif
+
<div class="col-md-offset-3 col-md-6">
<h1>Edit Experiment</h1>
@@ -38,14 +44,11 @@
This experiment is connected with an Application which is currently not deployed on any Resource. The experiment cannot be launched at the moment.
</p>
@endif
+ <input type="hidden" id="allowedFileSize" value="{{ $expInputs['allowedFileSize'] }}"/>
</form>
</div>
</div>
-
-{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
-
-@include('partials/sharing-form-modal', array("entityName" => "experiment"))
@stop
@@ -54,12 +57,14 @@
<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.");
+ var allowedFileSize = $("#allowedFileSize").val();
+ var tooLargeFilenames = util.validateMaxUploadFileSize(this.files, allowedFileSize);
+
+ if (tooLargeFilenames.length > 0) {
+ var singleOrMultiple = tooLargeFilenames.length === 1 ? " the file [" : " each of the files [";
+ alert("The size of " + singleOrMultiple + tooLargeFilenames.join(", ") + "] is greater than the allowed file size (" + allowedFileSize + " MB) in a form. Please upload another file.");
$(this).val("");
}
-
});
$("#enableEmail").change(function () {
@@ -92,5 +97,16 @@
}
});
});
+
+ updateList = function() {
+ var input = document.getElementById('optInputFiles');
+ var output = document.getElementById('optFileList');
+
+ output.innerHTML = '<ul>';
+ for (var i = 0; i < input.files.length; ++i) {
+ output.innerHTML += '<li>' + input.files.item(i).name + '</li>';
+ }
+ output.innerHTML += '</ul>';
+ }
</script>
@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/partials/experiment-container.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-container.blade.php b/app/views/partials/experiment-container.blade.php
index 2d28b2d..9f7e347 100644
--- a/app/views/partials/experiment-container.blade.php
+++ b/app/views/partials/experiment-container.blade.php
@@ -28,10 +28,8 @@
<a href="{{URL::to('/')}}/experiment/summary?expId={{urlencode($experiment['experiment']->experimentId)}}" target="_blank">
{{{ $experiment['experiment']->name }}}
</a>
- @if(Config::get('pga_config.airavata')["data-sharing-enabled"])
- @if( $experiment['expValue']['editable'] and $can_write[$experiment['experiment']->experimentId] === true)
- <a href="{{URL::to('/')}}/experiment/edit?expId={{urlencode($experiment['experiment']->experimentId)}}" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>
- @endif
+ @if( $experiment['expValue']['editable'] and $can_write[$experiment['experiment']->experimentId] === true)
+ <a href="{{URL::to('/')}}/experiment/edit?expId={{urlencode($experiment['experiment']->experimentId)}}" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>
@endif
</td>
<td>{{$experiment['experiment']->userName}}</td>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/partials/experiment-inputs.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-inputs.blade.php b/app/views/partials/experiment-inputs.blade.php
index 90cb2fa..956e99d 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -21,9 +21,11 @@
{{ ExperimentUtilities::create_application_select($expInputs['application'], false) }}
</div>
+@if (Config::get('pga_config.airavata')["data-sharing-enabled"])
<div class="form-group">
@include('partials/sharing-display-body', array("form" => $canEditSharing))
</div>
+@endif
<div class="panel panel-default">
<div class="panel-heading">Application configuration</div>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/project/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/browse.blade.php b/app/views/project/browse.blade.php
index 8700882..a7e322e 100755
--- a/app/views/project/browse.blade.php
+++ b/app/views/project/browse.blade.php
@@ -108,7 +108,7 @@
<td>
{{$project->name}}
@if($can_write[$project->projectID])
- <a href="{{URL::to('/')}}/project/edit?projId={{rawurlencode($project->projectID)}}" title="Edit">
+ <a href="{{URL::to('/')}}/project/edit?projId={{urlencode($project->projectID)}}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
@endif
@@ -123,7 +123,7 @@
<a href="{{URL::to('/')}}/project/summary?projId={{ urlencode($project->projectID) }}">
<span class="glyphicon glyphicon-list"></span>
</a>
- <a href="{{URL::to('/')}}/project/summary?projId={{{ $project->projectID }}}"> View</a>
+ <a href="{{URL::to('/')}}/project/summary?projId={{ urlencode($project->projectID) }}"> View</a>
</td>
</tr>
<?php
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/project/no-sharing-browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/no-sharing-browse.blade.php b/app/views/project/no-sharing-browse.blade.php
deleted file mode 100755
index 7b79e4c..0000000
--- a/app/views/project/no-sharing-browse.blade.php
+++ /dev/null
@@ -1,146 +0,0 @@
-@extends('layout.basic')
-
-@section('page-header')
-@parent
-@stop
-
-@section('content')
-
-<div class="container" style="max-width: 80%;">
-
- <form action="{{ URL::to('/') }}/project/browse" method="post" class="form-inline" role="form">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3>Search for Projects</h3>
- </div>
- <div class="panel-body">
- <div class="form-group">
- <label for="search-key">Search by</label>
- <select class="form-control" name="search-key" id="search-key">
- <option value="project-name">Project Name</option>
- <option value="project-description">Project description</option>
- </select>
- </div>
-
- <div class="form-group">
- <label for="search-value">for</label>
- <input type="search" class="form-control" name="search-value" id="search-value" placeholder="value"
- value="<?php if (isset($_POST['search-value'])) echo $_POST['search-value'] ?>">
- </div>
-
- <button name="search" type="submit" class="btn btn-primary" value="Search"><span
- class="glyphicon glyphicon-search"></span> Search
- </button>
- <p class="help-block">You can use * as a wildcard character. Tip: search for * alone to retrieve all of your
- projects.</p>
- </div>
- </div>
-
-
- <!-- Pagination Handling -->
- <?php
- if (isset($projects)) {
- ?>
- <div class="pull-right btn-toolbar" style="padding-bottom: 5px">
- <?php
- if ($pageNo != 1) {
- echo '<input class="btn btn-primary btn-xs" type="submit" style="cursor: pointer" name="prev" value="Previous"/>';
- }
- if (sizeof($projects) > 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($projects) != 0) echo 'Showing projects from ' . strval(($pageNo - 1) * $limit + 1)
- . ' to ' . strval(min($pageNo * $limit, ($pageNo - 1) * $limit + sizeof($projects))); ?>
- </div>
- <input type="hidden" name="pageNo" value="<?php echo($pageNo) ?>"/>
- <div style="clear: both"></div>
- <?php
- }
- ?>
- </form>
-
-
-
-
-
- <?php
-
- if (isset($projects))
- {
- /**
- * get results
- */
-
- /**
- * display results
- */
- if (sizeof($projects) == 0)
- {
- if ($pageNo == 1) {
- CommonUtilities::print_warning_message('No results found. Please try again.');
- } else {
- CommonUtilities::print_warning_message('No more results found.');
- }
- }
- else
- {
- ?>
- <div class="table-responsive">
- <table class="table">
-
- <tr>
-
- <th>Name</th>
- <th>Owner</th>
- <th>Creation Time</th>
- <th>Experiments</th>
-
- </tr>
- <?php
-
- foreach ($projects as $project) {
-
- ?>
- <tr>
- <td>
- {{{ $project->name }}}
- <a href="{{URL::to('/')}}/project/edit?projId={{ urlencode($project->projectID) }}" title="Edit">
- <span class="glyphicon glyphicon-pencil"></span>
- </a>
- </td>
- <td>
- {{$project->owner}}
- </td>
- <td class="time" unix-time="
- <?php echo $project->creationTime / 1000 ?>">
- </td>
- <td>
- <a href="{{URL::to('/')}}/project/summary?projId={{ urlencode($project->projectID) }}">
- <span class="glyphicon glyphicon-list"></span>
- </a>
- <a href="{{URL::to('/')}}/project/summary?projId={{ urlencode($project->projectID) }}"> View</a>
- </td>
- </tr>
- <?php
-
- }
-
- echo '</table>';
- echo '</div>';
- }
-
- }
-
- ?>
-
-
- </div>
-
- @stop
- @section('scripts')
- @parent
- {{ HTML::script('js/time-conversion.js')}}
- @stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/project/no-sharing-create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/no-sharing-create.blade.php b/app/views/project/no-sharing-create.blade.php
index 665fe78..2efc0ed 100755
--- a/app/views/project/no-sharing-create.blade.php
+++ b/app/views/project/no-sharing-create.blade.php
@@ -1,6 +1,6 @@
@extends('layout.basic')
@section('page-header')
- @parent
+@parent
@stop
@section('content')
@@ -30,4 +30,4 @@
</div>
-@stop
\ No newline at end of file
+@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/project/no-sharing-edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/no-sharing-edit.blade.php b/app/views/project/no-sharing-edit.blade.php
index 8e17b72..c7da3f9 100755
--- a/app/views/project/no-sharing-edit.blade.php
+++ b/app/views/project/no-sharing-edit.blade.php
@@ -1,7 +1,7 @@
@extends('layout.basic')
@section('page-header')
- @parent
+@parent
@stop
@section('content')
@@ -46,4 +46,4 @@
</div>
-@stop
\ No newline at end of file
+@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b68d9a8d/app/views/project/no-sharing-summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/no-sharing-summary.blade.php b/app/views/project/no-sharing-summary.blade.php
index 48307d5..95bf319 100755
--- a/app/views/project/no-sharing-summary.blade.php
+++ b/app/views/project/no-sharing-summary.blade.php
@@ -1,7 +1,7 @@
@extends('layout.basic')
@section('page-header')
- @parent
+@parent
@stop
@section('content')