airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: fixing project summary field oridering and links
Date Wed, 28 Oct 2015 18:11:10 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 109d1d4d2 -> b079f41ee


fixing project summary field oridering and links


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/b079f41e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b079f41e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b079f41e

Branch: refs/heads/master
Commit: b079f41eea7c9e4a8956c173cff01da622f48060
Parents: 109d1d4
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Oct 28 14:11:05 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Oct 28 14:11:05 2015 -0400

----------------------------------------------------------------------
 app/views/project/summary.blade.php | 57 +++++++++++++++-----------------
 1 file changed, 26 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b079f41e/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index 6e003b9..8ba35f6 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -48,30 +48,6 @@
         $expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
         $applicationInterface = AppUtilities::get_application_interface($experiment->executionId);
 
-        echo '<tr>';
-
-
-        echo '<td>'. $experiment->experimentName . '</td>';
-
-        echo "<td>$applicationInterface->applicationName</td>";
-
-        echo '<td>';
-        try {
-            $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData
-                ->computationalResourceScheduling->resourceHostId);
-            if (!empty($cr)) {
-                echo $cr->hostName;
-            }
-        } catch (Exception $ex) {
-            //Error while retrieving the CR
-        }
-        echo '</td>';
-        echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"]
. '"></td>';
-
-
-        echo '<td>';
-
-
         switch ($expValues["experimentStatusString"]) {
             case 'CANCELING':
             case 'CANCELED':
@@ -89,26 +65,45 @@
                 break;
         }
 
+        echo '<tr>';
+
+        echo '<td>';
         switch ($expValues["experimentStatusString"]) {
             case 'SCHEDULED':
             case 'LAUNCHED':
             case 'EXECUTING':
             case 'CANCELING':
             case 'COMPLETED':
-                echo '<a class="' . $textClass . '" href="' . URL::to('/') . '/experiment/summary?expId='
.
-                    $experiment->experimentId . '">' . $expValues["experimentStatusString"]
. '</a>';
+                echo '<a href="' . URL::to('/') . '/experiment/summary?expId=' .
+                        $experiment->experimentId . '">' . $experiment->experimentName
. '</a>';
                 break;
             default:
-                echo '<a class="' . $textClass . '" href="' . URL::to('/') . '/experiment/summary?expId='
.
-                    $experiment->experimentId . '">' . $expValues["experimentStatusString"]
. '</a>' .
-                    ' <a href="' . URL::to('/') . '/experiment/edit?expId=' .
-                    $experiment->experimentId .
-                    '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>';
+                echo '<a href="' . URL::to('/') . '/experiment/summary?expId=' .
+                        $experiment->experimentId . '">' . $experiment->experimentName
. '</a>' .
+                        ' <a href="' . URL::to('/') . '/experiment/edit?expId=' .
+                        $experiment->experimentId .
+                        '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>';
                 break;
         }
+        echo '</td>';
 
+        echo "<td>$applicationInterface->applicationName</td>";
 
+        echo '<td>';
+        try {
+            $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData
+                ->computationalResourceScheduling->resourceHostId);
+            if (!empty($cr)) {
+                echo $cr->hostName;
+            }
+        } catch (Exception $ex) {
+            //Error while retrieving the CR
+        }
         echo '</td>';
+        echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"]
. '"></td>';
+
+
+        echo '<td><div class="' . $textClass . '">' . $expValues["experimentStatusString"]
. '</div></td>';
 
         if ($expValues["jobState"]) echo '
             <td>' . $expValues["jobState"] . '</td>';


Mime
View raw message