From b919f39b3186c5f022d3965cf6023ff9041e91ca Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 11 Mar 2016 01:58:55 +0100
Subject: Customizing doorkeeper views for authorizing app

---
 app/views/doorkeeper/authorizations/error.html.erb |  7 ----
 .../doorkeeper/authorizations/error.html.haml      |  4 +++
 app/views/doorkeeper/authorizations/new.html.erb   | 40 ----------------------
 app/views/doorkeeper/authorizations/new.html.haml  | 26 ++++++++++++++
 app/views/doorkeeper/authorizations/show.html.erb  |  7 ----
 app/views/doorkeeper/authorizations/show.html.haml |  2 ++
 6 files changed, 32 insertions(+), 54 deletions(-)
 delete mode 100644 app/views/doorkeeper/authorizations/error.html.erb
 create mode 100644 app/views/doorkeeper/authorizations/error.html.haml
 delete mode 100644 app/views/doorkeeper/authorizations/new.html.erb
 create mode 100644 app/views/doorkeeper/authorizations/new.html.haml
 delete mode 100644 app/views/doorkeeper/authorizations/show.html.erb
 create mode 100644 app/views/doorkeeper/authorizations/show.html.haml

(limited to 'app/views/doorkeeper/authorizations')

diff --git a/app/views/doorkeeper/authorizations/error.html.erb b/app/views/doorkeeper/authorizations/error.html.erb
deleted file mode 100644
index 2247c0d54..000000000
--- a/app/views/doorkeeper/authorizations/error.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="page-header">
-  <h1><%= t('doorkeeper.authorizations.error.title') %></h1>
-</div>
-
-<main role="main">
-  <pre><%= @pre_auth.error_response.body[:error_description] %></pre>
-</main>
diff --git a/app/views/doorkeeper/authorizations/error.html.haml b/app/views/doorkeeper/authorizations/error.html.haml
new file mode 100644
index 000000000..cb97ae170
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/error.html.haml
@@ -0,0 +1,4 @@
+.prompt= t('doorkeeper.authorizations.error.title')
+
+#error_explanation
+  = @pre_auth.error_response.body[:error_description]
diff --git a/app/views/doorkeeper/authorizations/new.html.erb b/app/views/doorkeeper/authorizations/new.html.erb
deleted file mode 100644
index c6f738b33..000000000
--- a/app/views/doorkeeper/authorizations/new.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<header class="page-header" role="banner">
-  <h1><%= t('.title') %></h1>
-</header>
-
-<main role="main">
-  <p class="h4">
-    <%= raw t('.prompt', client_name: "<strong class=\"text-info\">#{ @pre_auth.client.name }</strong>") %>
-  </p>
-
-  <% if @pre_auth.scopes.count > 0 %>
-    <div id="oauth-permissions">
-      <p><%= t('.able_to') %>:</p>
-
-      <ul class="text-info">
-        <% @pre_auth.scopes.each do |scope| %>
-          <li><%= t scope, scope: [:doorkeeper, :scopes] %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="actions">
-    <%= form_tag oauth_authorization_path, method: :post do %>
-      <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
-      <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
-      <%= hidden_field_tag :state, @pre_auth.state %>
-      <%= hidden_field_tag :response_type, @pre_auth.response_type %>
-      <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success btn-lg btn-block" %>
-    <% end %>
-    <%= form_tag oauth_authorization_path, method: :delete do %>
-      <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
-      <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
-      <%= hidden_field_tag :state, @pre_auth.state %>
-      <%= hidden_field_tag :response_type, @pre_auth.response_type %>
-      <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "btn btn-danger btn-lg btn-block" %>
-    <% end %>
-  </div>
-</main>
diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml
new file mode 100644
index 000000000..91d71cc01
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/new.html.haml
@@ -0,0 +1,26 @@
+.prompt= raw t('.prompt', client_name: "<strong class=\"prompt-highlight\">#{ @pre_auth.client.name }</strong>")
+
+/- if @pre_auth.scopes.count > 0
+/  .scope-permission-prompt
+/    %p= t('.able_to')
+
+/    %ul.scope-permissions
+/      - @pre_auth.scopes.each do |scope|
+/        %li= t scope, scope: [:doorkeeper, :scopes]
+
+.actions
+  = form_tag oauth_authorization_path, method: :post do
+    = hidden_field_tag :client_id, @pre_auth.client.uid
+    = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
+    = hidden_field_tag :state, @pre_auth.state
+    = hidden_field_tag :response_type, @pre_auth.response_type
+    = hidden_field_tag :scope, @pre_auth.scope
+    = button_tag t('doorkeeper.authorizations.buttons.authorize'), type: :submit
+
+  = form_tag oauth_authorization_path, method: :delete do
+    = hidden_field_tag :client_id, @pre_auth.client.uid
+    = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
+    = hidden_field_tag :state, @pre_auth.state
+    = hidden_field_tag :response_type, @pre_auth.response_type
+    = hidden_field_tag :scope, @pre_auth.scope
+    = button_tag t('doorkeeper.authorizations.buttons.deny'), type: :submit, class: 'negative'
diff --git a/app/views/doorkeeper/authorizations/show.html.erb b/app/views/doorkeeper/authorizations/show.html.erb
deleted file mode 100644
index f4d661019..000000000
--- a/app/views/doorkeeper/authorizations/show.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<header class="page-header">
-  <h1><%= t('.title') %>:</h1>
-</header>
-
-<main role="main">
-  <code id="authorization_code"><%= params[:code] %></code>
-</main>
diff --git a/app/views/doorkeeper/authorizations/show.html.haml b/app/views/doorkeeper/authorizations/show.html.haml
new file mode 100644
index 000000000..44638318b
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/show.html.haml
@@ -0,0 +1,2 @@
+.prompt= t('.title')
+%code.copypasteable= params[:code]
-- 
cgit