airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata-php-gateway git commit: AIRAVATA-2430 Logo config option for external identity providers
Date Sat, 24 Jun 2017 18:16:07 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop b5cc85089 -> f6cc00abd


AIRAVATA-2430 Logo config option for external identity providers


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

Branch: refs/heads/develop
Commit: f6cc00abd12b0e2ee041cbbf742658f4175c3e76
Parents: b5cc850
Author: Marcus Christie <machrist@iu.edu>
Authored: Sat Jun 24 14:15:18 2017 -0400
Committer: Marcus Christie <machrist@iu.edu>
Committed: Sat Jun 24 14:15:18 2017 -0400

----------------------------------------------------------------------
 app/config/pga_config.php.template          |   7 +++++--
 app/views/partials/login-external.blade.php |   7 ++++++-
 public/assets/cilogon-logo-24x24-b.png      | Bin 0 -> 936 bytes
 3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f6cc00ab/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index c20202c..86c5177 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -68,10 +68,13 @@ return array(
             // Example of external identity provider login
             [
                 'oauth-grant-type' => 'authorization_code',
-                // kc_idp_hint is used to skip Keycloak login screen and redirect immediately
to this identity provider
+                'name' => 'CILogon',
+                // Optional
+                // Note: kc_idp_hint is used to skip Keycloak login screen and redirect immediately
to this identity provider
                 // http://www.keycloak.org/docs/2.5/server_admin/topics/identity-broker/suggested.html
                 'oauth-authorize-url-extra-params' => 'kc_idp_hint=oidc',
-                'name' => 'CILogon',
+                // Optional
+                'logo': '/assets/path_to_image.png'
             ],
         ],
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f6cc00ab/app/views/partials/login-external.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/login-external.blade.php b/app/views/partials/login-external.blade.php
index 15e3f7c..aed312b 100644
--- a/app/views/partials/login-external.blade.php
+++ b/app/views/partials/login-external.blade.php
@@ -1,4 +1,9 @@
 
 @foreach ($auth_code_options as $auth_code_option)
-    <a href="{{ $auth_code_option["auth_url"] }}" class="btn btn-primary">Sign in with
{{{ $auth_code_option["name"] }}}</a>
+    <a href="{{ $auth_code_option["auth_url"] }}" class="btn btn-primary">
+        @if (isset($auth_code_option["logo"]))
+        <img src="{{ $auth_code_option["logo"] }}">
+        @endif
+        Sign in with {{{ $auth_code_option["name"] }}}
+    </a>
 @endforeach

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f6cc00ab/public/assets/cilogon-logo-24x24-b.png
----------------------------------------------------------------------
diff --git a/public/assets/cilogon-logo-24x24-b.png b/public/assets/cilogon-logo-24x24-b.png
new file mode 100644
index 0000000..b26fc4f
Binary files /dev/null and b/public/assets/cilogon-logo-24x24-b.png differ


Mime
View raw message