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 2015/04/21 20:05:46 UTC
[1/2] airavata-php-gateway git commit: Experiment Stages Prototype
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 8763d6c64 -> 716a45358
Experiment Stages Prototype
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/7e046a1c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7e046a1c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7e046a1c
Branch: refs/heads/master
Commit: 7e046a1c28e76f8fe2d93a6adb507a99a5391d2b
Parents: 646ff18
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Apr 21 14:04:10 2015 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Apr 21 14:04:10 2015 -0400
----------------------------------------------------------------------
app/routes.php | 2 +
app/views/admin/manage-experiments.blade.php | 88 +++++++++++++++++++++++
public/css/admin.css | 68 ++++++++++++++++++
3 files changed, 158 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7e046a1c/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 212ee90..5689f5c 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -152,6 +152,8 @@ Route::get("admin/dashboard/users", "AdminController@usersView");
Route::get("admin/dashboard/roles", "AdminController@rolesView");
+Route::get("admin/dashboard/experiments", "AdminController@experimentsView");
+
Route::get("admin/dashboard/credential-store", "AdminController@credentialStoreView");
Route::get("manage/users", "AdminController@usersView");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7e046a1c/app/views/admin/manage-experiments.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php
index e8236e8..b18670a 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -25,6 +25,79 @@
</div>
+ <div class="row">
+ <div class="tree">
+ <ul>
+ <li>
+ <span><i class="icon-calendar"></i>Experiment 1</span>
+ <ul>
+ <li>
+ <span class="badge badge-success"><i class="icon-minus-sign"></i>Pre Processing</span>
+ <ul>
+ <li>
+ <a href=""><span class="alert alert-success"><i class="icon-time"></i>2015-04-17 15:21:21</span> – PGA to Airavata Authentication Successful</a>
+ </li>
+ <li>
+ <a href=""><span class="alert alert-success"><i class="icon-time"></i>2015-04-17 15:21:21</span> – Airavata to Resource Authentication Successful</a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <span class="badge badge-success"><i class="icon-minus-sign"></i>Input Staging</span>
+ <ul>
+ <li>
+ <span class="alert alert-success"><i class="icon-time"></i>2015-04-17 15:21:21</span> – <a href="">PGA to Airavata File Transfer Successful</a>
+ </li>
+ <li>
+ <span class="alert alert-success"abhi ><i class="icon-time"></i>2015-04-17 15:21:21</span> – <a href="">Airavata to Resource File Transfer Successful</a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <span class="badge badge-warning"><i class="icon-minus-sign"></i>Job Description</span>
+ <ul>
+ <li>
+ <a href=""><span>
+ Long Script of Job Description / PBS Script <br/>
+ <br/>
+ <p>
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean
+ </p>
+ </span></a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <span class="badge badge-important"><i class="icon-minus-sign"></i>Execution</span>
+ <ul>
+ <li>
+ <a href=""><span class="alert alert-success"><i class="icon-time"></i>2015-04-17 15:21:21</span> – Execution of Job Description - No errors</a>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <span class="badge badge-important"><i class="icon-minus-sign"></i>Experiment Complete</span>
+ <ul>
+ <li>
+ <a href=""><span class="alert alert-danger"><i class="icon-time"></i>2015-04-17 15:21:21</span> – Output Transfer from Resource to Airavata UnSuccessful</a>
+ <br/>
+ <span> Some text about failure</span>
+ </li>
+ <li>
+ <a href=""><span class="alert alert-danger"><i class="icon-time"></i>2015-04-17 15:21:21</span> – Output Transfer from Airavata to PGA UnSuccessful</a>
+ <br/>
+ <span> Some text about failure</span>
+ </li>
+ </ul>
+ </li>
+
+
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
</div>
<!-- /.container-fluid -->
@@ -49,5 +122,20 @@
$(".toggle-add-tenant").click( function(){
$(".add-tenant").slideDown();
});
+
+ $(function () {
+ $('.tree li:has(ul)').addClass('parent_li').find(' > span').attr('title', 'Collapse this branch');
+ $('.tree li.parent_li > span').on('click', function (e) {
+ var children = $(this).parent('li.parent_li').find(' > ul > li');
+ if (children.is(":visible")) {
+ children.hide('fast');
+ $(this).attr('title', 'Expand this branch').find(' > i').addClass('icon-plus-sign').removeClass('icon-minus-sign');
+ } else {
+ children.show('fast');
+ $(this).attr('title', 'Collapse this branch').find(' > i').addClass('icon-minus-sign').removeClass('icon-plus-sign');
+ }
+ e.stopPropagation();
+ });
+ });
</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7e046a1c/public/css/admin.css
----------------------------------------------------------------------
diff --git a/public/css/admin.css b/public/css/admin.css
index 58739c5..3c93a7d 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -237,3 +237,71 @@ ul.alert-dropdown {
color: #fff;
}
.add-role, .add-tenant{ display: none;}
+
+
+
+/*------------------------------------experiment Stages CSS --------------*/
+
+.tree {
+ min-height:20px;
+ padding:19px;
+ margin-bottom:20px;
+ background-color:#fbfbfb;
+ border:1px solid #999;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ -webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);
+ box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05)
+}
+.tree li {
+ list-style-type:none;
+ margin:0;
+ padding:10px 5px 0 5px;
+ position:relative
+}
+.tree li::before, .tree li::after {
+ content:'';
+ left:-20px;
+ position:absolute;
+ right:auto
+}
+.tree li::before {
+ border-left:1px solid #999;
+ bottom:50px;
+ height:100%;
+ top:0;
+ width:1px
+}
+.tree li::after {
+ border-top:1px solid #999;
+ height:20px;
+ top:25px;
+ width:25px
+}
+.tree li span {
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border:1px solid #999;
+ border-radius:5px;
+ display:inline-block;
+ padding:3px 8px;
+ text-decoration:none
+}
+.tree li.parent_li>span {
+ cursor:pointer
+}
+.tree>ul>li::before, .tree>ul>li::after {
+ border:0
+}
+.tree li:last-child::before {
+ height:30px
+}
+.tree li.parent_li>span:hover, .tree li.parent_li>span:hover+ul li span {
+ background:#eee;
+ border:1px solid #94a0b4;
+ color:#000
+}
+
+/* ------------------- experiment Stages CSS over ---------------- */
\ No newline at end of file
[2/2] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by nd...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/716a4535
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/716a4535
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/716a4535
Branch: refs/heads/master
Commit: 716a45358ad012a95ca5364aea4e6b577c07f673
Parents: 7e046a1 8763d6c
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Apr 21 14:05:19 2015 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Apr 21 14:05:19 2015 -0400
----------------------------------------------------------------------
app/config/app_config.ini | 94 ------------------------------------------
1 file changed, 94 deletions(-)
----------------------------------------------------------------------