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 2017/05/28 01:43:49 UTC
[1/2] airavata-php-gateway git commit: Adding Base theme changes to
Airavata PGA.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 2f41e27d1 -> d8cb5603c
Adding Base theme changes to Airavata PGA.
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/5edae07a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5edae07a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5edae07a
Branch: refs/heads/develop
Commit: 5edae07a570be26d45cd7679d1c3ff0ab2dbca23
Parents: e338c82
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sat May 27 18:42:42 2017 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sat May 27 18:42:42 2017 -0700
----------------------------------------------------------------------
public/themes/base/partials/about.blade.php | 0
.../base/partials/documentation.blade.php | 0
public/themes/base/partials/header.blade.php | 45 ++++++++++++++++++++
3 files changed, 45 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5edae07a/public/themes/base/partials/about.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/partials/about.blade.php b/public/themes/base/partials/about.blade.php
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5edae07a/public/themes/base/partials/documentation.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/partials/documentation.blade.php b/public/themes/base/partials/documentation.blade.php
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5edae07a/public/themes/base/partials/header.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/partials/header.blade.php b/public/themes/base/partials/header.blade.php
index e69de29..15fd52a 100644
--- a/public/themes/base/partials/header.blade.php
+++ b/public/themes/base/partials/header.blade.php
@@ -0,0 +1,45 @@
+<title>PGA for Science Gateways</title>
+
+<link media="all" type="text/css" rel="stylesheet" href="{{ URL::to('/') }}/themes/{{Session::get('theme')}}/assets/css/style.css"/>
+
+ <nav class="nav navbar-default">
+
+ <div class="container-fluid">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header page-scroll" id="home">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand page-scroll" href="{{ URL::to('/') }}/home">
+ PHP Gateway
+ </a>
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li class="hidden">
+ <a href="#page-top"></a>
+ </li>
+ <li>
+ <a class="page-scroll" href="{{URL::to('/')}}/pages/documentation">Documentation</a>
+ </li>
+ <li>
+ <a class="page-scroll" href="{{URL::to('/')}}/pages/about">About</a>
+ </li>
+ <li>
+ <a class="page-scroll" href="{{URL::to('/')}}/#contact-scigap">Contact</a>
+ </li>
+ <!--
+ <li>
+ <a class="page-scroll btn btn-primary" href="#collaborators">Get Access</a>
+ </li>
+ -->
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
+ </div>
+</nav>
\ No newline at end of file
[2/2] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/d8cb5603
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d8cb5603
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d8cb5603
Branch: refs/heads/develop
Commit: d8cb5603c9eb452038a99d521992f981ffc209ea
Parents: 5edae07 2f41e27
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sat May 27 18:43:29 2017 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sat May 27 18:43:29 2017 -0700
----------------------------------------------------------------------
app/controllers/ComputeResourceController.php | 28 ++++-
app/controllers/ExperimentController.php | 109 ++++++++-----------
.../Model/AppCatalog/ComputeResource/Types.php | 48 +++++++-
app/libraries/AppUtilities.php | 5 +-
app/views/application/deployment.blade.php | 4 +-
app/views/experiment/create-complete.blade.php | 2 +
app/views/experiment/edit.blade.php | 2 +
app/views/partials/deployment-block.blade.php | 28 ++++-
.../partials/experiment-queue-block.blade.php | 98 ++++++++++++-----
app/views/partials/queue-block.blade.php | 36 ++++++
app/views/resource/edit.blade.php | 40 +++----
app/views/resource/view.blade.php | 40 +++----
public/js/deployment.js | 22 ++++
13 files changed, 316 insertions(+), 146 deletions(-)
----------------------------------------------------------------------