scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 14:41:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1381 from okriuchykhin/ok_SCI_2859

Browse source 
Refactor & restyle the API authorization screen [SCI-2859]
This commit is contained in:
Alex Kriuchykhin 2018-11-22 13:06:13 +01:00 committed by GitHub
commit 95e19e1229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/stylesheets/themes/scinote.scss
View file

@ -1944,3 +1944,23 @@ a.disabled-with-click-events {
.tiny-mce-pdf-ready {
max-width: 100%;
}
.doorkeeper-authorization {
.doorkeeper-scinote-logo {
background-image: asset-url("/images/scinote_icon.jpg");
background-position: center center;
background-repeat: no-repeat;
background-size: contain;
height: 180px;
}
.doorkeeper-actions-left {
padding-right: 3px;
}
.doorkeeper-actions-right {
padding-left: 3px;
}
}

71
app/views/doorkeeper/authorizations/new.html.erb
View file

@ -1,42 +1,53 @@
<div class="center-block center-block-narrow">
<header class="page-header" role="banner">
<h1><%= t('.title') %></h1>
</header>
<% provide(:head_title, t('doorkeeper.authorizations.new.head_title')) %>
<main role="main">
<p class="h4">
<%= raw t('.prompt', client_name: content_tag(:strong, class: 'text-info') { @pre_auth.client.name }) %>
</p>
<div class="center-block center-block-narrow doorkeeper-authorization">
<div class="row text-center">
<div class="doorkeeper-scinote-logo"></div>
</div>
<% if @pre_auth.scopes.count > 0 %>
<div id="oauth-permissions">
<p><%= t('.able_to') %>:</p>
<h3 class="text-justify">
<%= t('doorkeeper.authorizations.new.title', client_name: @pre_auth.client.name ) %>
</h3>
<br>
<div>
<h5>
<strong><%= @pre_auth.client.name %></strong>
<%= t('doorkeeper.authorizations.new.scopes_title') %>
</h5>
<ul>
<li><%= t('doorkeeper.authorizations.new.scope_1') %></li>
<li><%= t('doorkeeper.authorizations.new.scope_2') %></li>
</ul>
<h5>
<%= t('doorkeeper.authorizations.new.terms', client_name: @pre_auth.client.name) %>
</h5>
</div>
<br>
<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 %>
<div class="row">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 text-right doorkeeper-actions-left">
<%= 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" %>
<%= hidden_field_tag :code_challenge, @pre_auth.code_challenge %>
<%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method %>
<%= submit_tag t('general.cancel'), class: "btn btn-default" %>
<% end %>
</div>
</main>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 text-left doorkeeper-actions-right">
<%= 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 %>
<%= hidden_field_tag :code_challenge, @pre_auth.code_challenge %>
<%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method %>
<%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success" %>
<% end %>
</div>
</div>
</div>

12
config/locales/en.yml
View file

@ -52,6 +52,18 @@ en:
email_already_taken: "SciNote account with email %{email} alreday exists"
failed_to_save: "Failed to create new user"
doorkeeper:
authorizations:
buttons:
authorize: "Authorize"
new:
head_title: "OAuth authorization"
title: "Authorize %{client_name} to connect to your SciNote account"
scopes_title: " would like to:"
scope_1: "Use basic profile information associated with your SciNote account"
scope_2: "Create, read, update, and delete data within SciNote on behalf of your user account using SciNote API."
terms: "%{client_name} terms may apply."
activerecord:
errors:
models: