You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/09/28 18:13:46 UTC
airavata-php-gateway git commit: adding missing views file
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 1f9f10b9c -> 9f4871ab1
adding missing views file
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/9f4871ab
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9f4871ab
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9f4871ab
Branch: refs/heads/develop
Commit: 9f4871ab16d9565adc5c8a57af3737d2cb1b36ff
Parents: 1f9f10b
Author: scnakandala <su...@gmail.com>
Authored: Wed Sep 28 14:13:43 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Sep 28 14:13:43 2016 -0400
----------------------------------------------------------------------
app/views/project/no-summary.blade.php | 119 ----------------------------
app/views/project/summary.blade.php | 119 ++++++++++++++++++++++++++++
2 files changed, 119 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9f4871ab/app/views/project/no-summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/no-summary.blade.php b/app/views/project/no-summary.blade.php
deleted file mode 100755
index a307a63..0000000
--- a/app/views/project/no-summary.blade.php
+++ /dev/null
@@ -1,119 +0,0 @@
-@extends('layout.basic')
-
-@section('page-header')
-@parent
-{{ HTML::style('css/sharing.css') }}
-@stop
-
-@section('content')
-
-<div class="container" style="max-width: 80%;">
- <?php
- $project = ProjectUtilities::get_project($_GET['projId']);
- ?>
- <h1>Project Summary
- @if( !isset($dashboard))
- <small><a href="{{ URL::to('/') }}/project/summary?projId={{ $project->projectID }}"
- title="Refresh"><span class="glyphicon glyphicon-refresh refresh-exp"></span></a></small>
- @endif
- </h1>
- <div>
- <div>
- <h3>{{ $project->name }}
- @if($project_can_write === true)
- <a href="edit?projId={{ $project->projectID }}" title="Edit">
- <span class="glyphicon glyphicon-pencil"></span>
- </a>
- @endif
- </h3>
- <p>{{ $project->description }}</p>
- </div>
- <div class="table-responsive">
- <table class="table">
- <tr>
-
- <th>Name</th>
- <th>Owner</th>
- <th>Application</th>
- <th>Compute Resource</th>
- <th>Last Modified Time</th>
- <th>Experiment Status</th>
- <th>Job Status</th>
-
- </tr>
- <?php
-
- foreach ($experiments as $experiment) {
- $expValues = ExperimentUtilities::get_experiment_values($experiment, true);
- $expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
- $applicationInterface = AppUtilities::get_application_interface($experiment->executionId);
-
- try {
- $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData->computationalResourceScheduling->resourceHostId);
- if (!empty($cr)) {
- $resourceName = $cr->hostName;
- }
- } catch (Exception $ex) {
- $resourceName = 'Error while retrieving the CR';
- }
- ?>
-
- <tr>
- <td>
- <a href="{{URL::to('/')}}/experiment/summary?expId={{$experiment->experimentId}}">
- {{ $experiment->experimentName }}
- </a>
- @if( $expValues['editable'] and $experiment_can_write[$experiment->experimentId] === true)
- <a href="{{URL::to('/')}}/experiment/edit?expId={{$experiment->experimentId}}" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>
- @endif
- </td>
- <td>{{ $experiment->userName }}</td>
- <td>
- @if( $applicationInterface != null )
- {{ $applicationInterface->applicationName }}
- @else
- <span class='text-danger'>Removed</span>
- @endif
- </td>
-
- <td>{{ $resourceName }}</td>
- <td class="time" unix-time="{{$expValues["experimentTimeOfStateChange"]}}"></td>
- <td>
- <div class="{{ExperimentUtilities::get_status_color_class( $expValues["experimentStatusString"])}}">
- {{ $expValues["experimentStatusString"] }}
- </div>
- </td>
-
- <td>
- @if (isset($expValues["jobState"]) )
- <div class="{{ ExperimentUtilities::get_status_color_class( $expValues["jobState"]) }}">
- {{ $expValues["jobState"] }}
- </div>
- @endif
- </td>
- </tr>
- <?php
- }
- ?>
- </table>
- </div>
- </div>
- <div style="margin-top: 10%;">
- @include('partials/sharing-display-body', array('form' => false))
- </div>
-</div>
-
-{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
-
-@stop
-@section('scripts')
-@parent
-<script>
-var users = {{ $users }};
-var owner = {{ $owner }};
-</script>
-{{ HTML::script('js/time-conversion.js')}}
-{{ HTML::script('js/sharing/sharing_utils.js') }}
-{{ HTML::script('js/sharing/share.js') }}
-
-@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9f4871ab/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
new file mode 100755
index 0000000..a307a63
--- /dev/null
+++ b/app/views/project/summary.blade.php
@@ -0,0 +1,119 @@
+@extends('layout.basic')
+
+@section('page-header')
+@parent
+{{ HTML::style('css/sharing.css') }}
+@stop
+
+@section('content')
+
+<div class="container" style="max-width: 80%;">
+ <?php
+ $project = ProjectUtilities::get_project($_GET['projId']);
+ ?>
+ <h1>Project Summary
+ @if( !isset($dashboard))
+ <small><a href="{{ URL::to('/') }}/project/summary?projId={{ $project->projectID }}"
+ title="Refresh"><span class="glyphicon glyphicon-refresh refresh-exp"></span></a></small>
+ @endif
+ </h1>
+ <div>
+ <div>
+ <h3>{{ $project->name }}
+ @if($project_can_write === true)
+ <a href="edit?projId={{ $project->projectID }}" title="Edit">
+ <span class="glyphicon glyphicon-pencil"></span>
+ </a>
+ @endif
+ </h3>
+ <p>{{ $project->description }}</p>
+ </div>
+ <div class="table-responsive">
+ <table class="table">
+ <tr>
+
+ <th>Name</th>
+ <th>Owner</th>
+ <th>Application</th>
+ <th>Compute Resource</th>
+ <th>Last Modified Time</th>
+ <th>Experiment Status</th>
+ <th>Job Status</th>
+
+ </tr>
+ <?php
+
+ foreach ($experiments as $experiment) {
+ $expValues = ExperimentUtilities::get_experiment_values($experiment, true);
+ $expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
+ $applicationInterface = AppUtilities::get_application_interface($experiment->executionId);
+
+ try {
+ $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData->computationalResourceScheduling->resourceHostId);
+ if (!empty($cr)) {
+ $resourceName = $cr->hostName;
+ }
+ } catch (Exception $ex) {
+ $resourceName = 'Error while retrieving the CR';
+ }
+ ?>
+
+ <tr>
+ <td>
+ <a href="{{URL::to('/')}}/experiment/summary?expId={{$experiment->experimentId}}">
+ {{ $experiment->experimentName }}
+ </a>
+ @if( $expValues['editable'] and $experiment_can_write[$experiment->experimentId] === true)
+ <a href="{{URL::to('/')}}/experiment/edit?expId={{$experiment->experimentId}}" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>
+ @endif
+ </td>
+ <td>{{ $experiment->userName }}</td>
+ <td>
+ @if( $applicationInterface != null )
+ {{ $applicationInterface->applicationName }}
+ @else
+ <span class='text-danger'>Removed</span>
+ @endif
+ </td>
+
+ <td>{{ $resourceName }}</td>
+ <td class="time" unix-time="{{$expValues["experimentTimeOfStateChange"]}}"></td>
+ <td>
+ <div class="{{ExperimentUtilities::get_status_color_class( $expValues["experimentStatusString"])}}">
+ {{ $expValues["experimentStatusString"] }}
+ </div>
+ </td>
+
+ <td>
+ @if (isset($expValues["jobState"]) )
+ <div class="{{ ExperimentUtilities::get_status_color_class( $expValues["jobState"]) }}">
+ {{ $expValues["jobState"] }}
+ </div>
+ @endif
+ </td>
+ </tr>
+ <?php
+ }
+ ?>
+ </table>
+ </div>
+ </div>
+ <div style="margin-top: 10%;">
+ @include('partials/sharing-display-body', array('form' => false))
+ </div>
+</div>
+
+{{ HTML::image("assets/Profile_avatar_placeholder_large.png", 'placeholder image', array('class' => 'baseimage')) }}
+
+@stop
+@section('scripts')
+@parent
+<script>
+var users = {{ $users }};
+var owner = {{ $owner }};
+</script>
+{{ HTML::script('js/time-conversion.js')}}
+{{ HTML::script('js/sharing/sharing_utils.js') }}
+{{ HTML::script('js/sharing/share.js') }}
+
+@stop