You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/23 14:59:24 UTC
[1/2] airavata-php-gateway git commit: AIRAVATA-2441 Use landingpage
for 'home' if user not logged in
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop aedf097d6 -> fa310a19e
AIRAVATA-2441 Use landingpage for 'home' if user not logged in
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/0c044407
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0c044407
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0c044407
Branch: refs/heads/develop
Commit: 0c044407923b752515e249a0099c6566125e340e
Parents: aedf097
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Aug 9 11:57:07 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Aug 9 17:28:27 2017 -0400
----------------------------------------------------------------------
app/controllers/HomeController.php | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0c044407/app/controllers/HomeController.php
----------------------------------------------------------------------
diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
index d8627dd..c3c48d9 100755
--- a/app/controllers/HomeController.php
+++ b/app/controllers/HomeController.php
@@ -17,7 +17,17 @@ class HomeController extends BaseController {
public function getIndex()
{
- Session::put("nav-active", "home");
+ Session::put("nav-active", "home");
+ // If not logged in and theme has a landing page, display the landing page
+ if (!CommonUtilities::id_in_session()){
+ try {
+ $theme = Theme::uses( Session::get("theme") );
+ // FIXME: can't figure out how to pass variables to the landingpage template
+ return View::make($theme->scope('landingpage')->location());
+ }catch (Exception $ex){
+ Log::debug("Theme has no landingpage view, will render standard home page", array($ex->getMessage()));
+ }
+ }
return View::make('home');
}
[2/2] airavata-php-gateway git commit: Fix storing gateway data as
JSON in HTML data attribute
Posted by ma...@apache.org.
Fix storing gateway data as JSON in HTML data attribute
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/fa310a19
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/fa310a19
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/fa310a19
Branch: refs/heads/develop
Commit: fa310a19e6b3afc2c7cff1dabbc6d734bf16598c
Parents: 0c04440
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Aug 23 10:58:34 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Aug 23 10:58:34 2017 -0400
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/fa310a19/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index dd14bd1..5e72642 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -144,7 +144,7 @@
<td style="max-width: 400px; word-wrap: break-word;">{{ $gp->gatewayPublicAbstract}}</td>
<td>{{$gatewayApprovalStatuses[$gp->gatewayApprovalStatus] }}</td>
<td>
- <input type="button" class="btn btn-primary btn-xs start-approval" id="view-{{ preg_replace('/[\s]/', '-',$gp->gatewayId) }}" data-gatewayobject='{{htmlentities(json_encode( $gp))}}' value="View"/>
+ <input type="button" class="btn btn-primary btn-xs start-approval" id="view-{{ preg_replace('/[\s]/', '-',$gp->gatewayId) }}" data-gatewayobject="{{htmlentities(json_encode( $gp))}}" value="View"/>
</td>
</tr>
@endforeach