You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/02/10 21:24:40 UTC

[2/2] airavata-php-gateway git commit: Added button to view detailed Task Info next to user friendly msg.

Added button to view detailed Task Info next to user friendly msg.


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

Branch: refs/heads/develop
Commit: 0bb39147b760270d53c0b21a524d9bf443c6c9bf
Parents: 2848f83
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Wed Feb 10 15:24:02 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Wed Feb 10 15:24:02 2016 -0500

----------------------------------------------------------------------
 app/views/admin/experiment-statistics.blade.php | 5 +++++
 app/views/partials/experiment-info.blade.php    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0bb39147/app/views/admin/experiment-statistics.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/experiment-statistics.blade.php b/app/views/admin/experiment-statistics.blade.php
index 86973de..7727057 100644
--- a/app/views/admin/experiment-statistics.blade.php
+++ b/app/views/admin/experiment-statistics.blade.php
@@ -210,4 +210,9 @@
             scrollTop: $(".get-experiment").offset().top - 100
         }, 1000);
     });
+
+    //element coming from experiment-info blade
+    $(document).on("click", ".popover-taskinfo", function(){ 
+        $(this).popover();
+    });
 </script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0bb39147/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index c2d26d2..81ac668 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -252,7 +252,7 @@
                                         <dt>Task Status : </dt> <dd>{{ $expVal["taskStates"][$task->taskStatus->state] }}</dd>
                                     @if( is_object( $task->taskError))
                                         <dt>Task Error Id : </dt><dd>{{ $task->taskError->errorId }}</dd>
-                                        <dt>Task Error Msg : </dt><dd>{{ $task->taskError->userFriendlyMessage }}</dd>
+                                        <dt>Task Error Msg : </dt><dd>{{ $task->taskError->userFriendlyMessage }} <a tabindex="0" class="popover-taskinfo btn btn-sm btn-default" role="button" data-toggle="popover" data-html="true" title="Detailed Task Information" data-content="{{ str_replace( ',', '<br/><br/>', $task->taskError->actualErrorMessage ) }}">More Info</a></dd>
                                     @endif
                                     @if( count( $task->jobs) > 0 )
                                         <dt>Jobs : </dt><dd>{{ count( $task->jobs)}}</dd>
@@ -301,4 +301,5 @@
 @section('scripts')
 @parent
 {{ HTML::script('js/time-conversion.js')}}
+
 @stop
\ No newline at end of file