From d6fffb045967e419fbaa06d939205d17ac2b2c6e Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 15 Jun 2020 00:14:54 +0300
Subject: [PATCH 1/3] New OAuth grid

---
 app/views/console/users/index.phtml | 45 ++++++++++++++++-------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 5ae5725421..a391f67e09 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -298,20 +298,20 @@ $providers = $this->getParam('providers', []);
         <li data-state="/console/users/providers?project={{router.params.project}}">
             <h2>OAuth2 Providers</h2>
 
-            <div class="box margin-bottom margin-top-large"
+            <div class="margin-bottom margin-top-large"
                 data-service="projects.get"
                 data-event="load,projects.create,projects.update,projects.deleteProject"
                 data-name="console-project"
                 data-param-project-id="{{router.params.project}}"
                 data-scope="console">
-                <ul class="list">
+                <ul class="tiles cell-3 margin-bottom-small">
                     <?php foreach ($providers as $provider => $data):
                         if (isset($data['enabled']) && !$data['enabled']) { continue; }
                         if (isset($data['mock']) && $data['mock']) { continue; }
                         $form = (isset($data['form'])) ? $data['form'] : false;
                         $beta = (isset($data['beta'])) ? $data['beta'] : false;
                         ?>
-                        <li class="clear <?php echo (isset($data['enabled']) && !$data['enabled']) ? 'dev-feature' : ''; ?>">
+                        <li class="<?php echo (isset($data['enabled']) && !$data['enabled']) ? 'dev-feature' : ''; ?>">
                             <div data-ui-modal class="modal close" data-button-alias="none" data-open-event="provider-update-<?php echo $provider; ?>">
                                 <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
@@ -363,24 +363,29 @@ $providers = $this->getParam('providers', []);
                                 </form>
                             </div>
 
-                            <span data-ls-if="
-                                {{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}} &&
-                                {{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
-                                <button class="switch on pull-end margin-top-small" data-ls-ui-trigger="provider-update-<?php echo $provider; ?>"></button>
-                            </span>
-                            <span data-ls-if="
-                                !{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}} ||
-                                !{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
-                                <button class="switch pull-end margin-top-small" data-ls-ui-trigger="provider-update-<?php echo $this->escape($provider); ?>"></button>
-                            </span>
+                            <div class="box padding-small margin-bottom">
+                                <span data-ls-if="
+                                    {{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}} &&
+                                    {{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
+                                    <button class="switch on pull-end" data-ls-ui-trigger="provider-update-<?php echo $provider; ?>"></button>
+                                </span>
 
-                            <img src="/images/oauth2/<?php echo $this->escape(strtolower($provider)); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="<?php echo $this->escape(ucfirst($provider)); ?> Logo" class="pull-start provider margin-end" />
-                            <span>
-                                <?php echo ucfirst($provider); ?> <?php if($beta): ?>(beta)<?php endif; ?>
-                            </span>
-                            <p class="margin-bottom-no margin-top-small text-one-liner">
-                                <a href="<?php echo $data['developers']; ?>" target="_blank" rel="noopener">OAuth2 Developer Docs<i class="icon-link-ext"></i></a>
-                            </p>
+                                <span data-ls-if="
+                                    !{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}} ||
+                                    !{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
+                                    <button class="switch pull-end" data-ls-ui-trigger="provider-update-<?php echo $this->escape($provider); ?>"></button>
+                                </span>
+
+                                <img src="/images/oauth2/<?php echo $this->escape(strtolower($provider)); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="<?php echo $this->escape(ucfirst($provider)); ?> Logo" class="pull-start provider margin-end" />
+                                
+                                <span class="text-size-small">
+                                    <?php echo ucfirst($provider); ?> <?php if($beta): ?>(beta)<?php endif; ?>
+                                </span>
+
+                                <p class="margin-bottom-no text-one-liner text-size-small">
+                                    <a href="<?php echo $data['developers']; ?>" target="_blank" rel="noopener">OAuth2 Docs<i class="icon-link-ext"></i></a>
+                                </p>
+                            </div>
                         </li>
                     <?php endforeach; ?>
                 </ul>

From d8ba32e8a24a30574e13b78165b3045783d3b993 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 15 Jun 2020 00:23:15 +0300
Subject: [PATCH 2/3] #413

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index d7902bbd8c..6a8c56c60c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@
 - UI performance & accessibility improvments
 - Updated ClamAV conntainer to version 1.0.9
 - All emails are now sent asynchronously for improved performance (@TorstenDittmann)
+- Updated grid for OAuth2 providers list in the console
 
 ## Bug Fixes
 

From 4bd84ea190b7504dd96ff4ac6691ea428b202c73 Mon Sep 17 00:00:00 2001
From: Rubens de Melo <rubensdemelo@gmail.com>
Date: Mon, 15 Jun 2020 11:05:47 -0300
Subject: [PATCH 3/3] Fix pt-br email auth recover

Grammatical corrections
---
 app/config/locales/templates/pt-br.email.auth.recovery.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/locales/templates/pt-br.email.auth.recovery.tpl b/app/config/locales/templates/pt-br.email.auth.recovery.tpl
index 40842104eb..5393316918 100644
--- a/app/config/locales/templates/pt-br.email.auth.recovery.tpl
+++ b/app/config/locales/templates/pt-br.email.auth.recovery.tpl
@@ -6,7 +6,7 @@
 </p>
 {{cta}}
 <p>
-    Caso você não solicitou a redefinição de senha, por favor ignore esta mensagem.
+    Caso não tenha solicitado a redefinição de senha, por favor ignore esta mensagem.
 </p>
 <p>
     Atenciosamente,