scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 01:03:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486)

Browse source 
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
This commit is contained in:
aignatov-bio 2021-08-16 10:51:46 +02:00 committed by GitHub
parent b89acc9a7b
commit 852d2cc03c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 56 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/settings/addons.scss
View file

@ -9,9 +9,14 @@
.addons-title {
border-bottom: $border-tertiary;
margin-bottom: 0;
padding-bottom: 15px;
}
.addons-subtitle {
margin-top: 2em;
}
.printers-container {
.printer {
border: $border-default;

20
app/assets/stylesheets/settings/webhooks.scss
View file

@ -67,6 +67,7 @@
.webhooks-list {
list-style: none;
padding-top: .5em;
}
.webhook-form {
@ -91,6 +92,9 @@
}
.webhook {
border-top: $border-tertiary;
padding: .5em 0;
.view-mode {
align-items: center;
display: flex;
@ -128,6 +132,22 @@
.fas {
margin-right: .25em;
}
.divider-label {
@include font-small;
color: $color-silver-chalice;
padding-left: 1em;
}
a {
border-radius: unset;
cursor: pointer;
padding: .5em 1em;
&:hover {
background: $color-concrete;
}
}
}
}

6
app/assets/stylesheets/shared/content_pane.scss
View file

@ -115,7 +115,7 @@
.dropdown-menu {
@include font-button;
min-width: 150px;
min-width: 200px;
padding: .5em 0;
a {
@ -136,6 +136,10 @@
right: 1em;
}
}
.fa-stack {
width: 2em;
}
}
}
}

2
app/views/label_printers/index.html.erb
View file

@ -30,7 +30,7 @@
<%= t("users.settings.account.label_printer.fluics_instruction.p1") %>
</li>
<li>
<%= t("users.settings.account.label_printer.fluics_instruction.p2") %>
<%= t("users.settings.account.label_printer.fluics_instruction.p2_html", link: Constants::SCINOTE_FLUICS_URL) %>
</li>
<li>
<%= t("users.settings.account.label_printer.fluics_instruction.p3") %>

2
app/views/repositories/_print_label_modal.html.erb
View file

@ -44,7 +44,7 @@
</p>
</div>
<div class="modal-footer">
<%= link_to t('repository_row.modal_print_label.no_printers.visit_blog'), '', class: "btn btn-primary" %>
<%= link_to t('repository_row.modal_print_label.no_printers.visit_blog'), Constants::SCINOTE_FLUICS_URL, class: "btn btn-primary", target: "_blank" %>
</div>
<% end %>
</div>

6
app/views/users/settings/account/addons/index.html.erb
View file

@ -6,8 +6,10 @@
<div class="tab-pane content-pane active" role="tabpanel">
<div class="row">
<h1 class="addons-title"><%= t('users.settings.account.addons.title') %></h1>
<div class="col-xs-12 col-sm-12">
<h1 class="addons-title"><%= t('users.settings.account.addons.title') %></h1>
<h2 class="addons-subtitle" ><%= t('users.settings.account.addons.scinote_addons') %></h2>
<div data-hook="settings-addons-container">
<em data-hook="settings-addons-no-addons">
<%= t('users.settings.account.addons.no_addons') %>
@ -17,7 +19,7 @@
</div>
<div class="row">
<div class="col-xs-12 col-sm-12">
<h1 class="addons-title"><%= t('users.settings.account.addons.label_printers') %></h1>
<h2 class="addons-subtitle"><%= t('users.settings.account.addons.label_printers') %></h2>
<div class="printers-container">
<div class="printer">
<div class="header">

3
app/views/users/settings/webhooks/index.html.erb
View file

@ -62,7 +62,7 @@
<% filter.webhooks.order(created_at: :desc).each do |webhook| %>
<li class="webhook <%= 'active' if webhook.active? %>">
<div class="view-mode">
<span class="webhook-text">
<span class="webhook-text" title="<%= webhook.url %>" >
<%= t('webhooks.index.webhook_text_html', method: webhook.http_method.upcase, url: webhook.url) %>
</span>
<% if webhook.active? %>
@ -81,6 +81,7 @@
<span><i class="fas fa-ellipsis-h"></i></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="webhookMenuButton<%= webhook.id %>">
<li class="divider-label"><%= t("webhooks.index.webhook_options").upcase %></li>
<li>
<a href="#" class="edit-webhook">
<i class="fas fa-pen"></i>

2
config/initializers/constants.rb
View file

@ -228,6 +228,8 @@ class Constants
ios: 'https://apps.apple.com/us/app/2fa-authenticator-2fas/id1217793794'
},
}
SCINOTE_FLUICS_URL = 'https://www.scinote.net/fluics/'.freeze
TWO_FACTOR_RECOVERY_CODE_COUNT = 6
TWO_FACTOR_RECOVERY_CODE_LENGTH = 12

30
config/locales/en.yml
View file

@ -1840,7 +1840,8 @@ en:
head_title: "Settings | Add-ons"
title: "Add-ons"
no_addons: "You have no SciNote Add-ons."
label_printers: Label Printers
scinote_addons: "Scinote add-ons"
label_printers: "Label Printers"
printers:
ready: "Ready"
not_ready: "Not ready"
@ -1848,17 +1849,17 @@ en:
enter_api_key: "Enter API key"
enabled: "Enabled"
fluics_printer:
title: "FLUICS Printer"
description: "Sustainable sample inventory management for innovative research labs."
title: "FLUICS Print"
description: "Truly a plug & play label printing solution."
label_printer:
fluics_printer: "Label printer: FLUICS Printer"
fluics_printer: "FLUICS Print: Label printers"
instructions: "Instructions"
fluics_instruction:
p1: "To make it work, please follow these steps:"
p2: "1. Open the FLUICS Connect web app or install an iOS / Android mobile app."
p3: "2. Sign up for a free account. Follow the instructions to set up your workspace."
p4: "3. Upgrade to a Pro Workspace to get your API key. Read more on how to get an API key."
p5: "4. Enter the API key into the field below and start printing your own labels."
p2_html: "1. <a href='%{link}' target='_blank'>Order</a> your FLUICS Print package. It includes an online printer, labels and the API key."
p3: "2. Plug the online printer to a power outlet and connect it to the internet with a LAN cable."
p4: "3. Enter the API key into the field below."
p5: "4. SciNote will find your printer and connect to it automatically. You can start printing labels."
settings: "Settings"
api_key_label: "API key"
api_key_warning: "API key change will lead to printer list refresh"
@ -2480,6 +2481,7 @@ en:
description: 'Saved activity filters are listed below as collapsible sections. You can add more saved filters on the Activities page. Each saved filter can hold several webhooks.'
new_webhook: "New webhook"
applied_filters: "Applied activity filters"
webhook_options: "Webhook options"
delete_filter_modal:
title: "Delete filter"
description_html: "Are you sure you want to delete <b></b>?"
@ -2530,12 +2532,12 @@ en:
comment_placeholder_new: "Add new comment…"
archived: "Archived"
sort:
new_html: "Started last"
old_html: "Started first"
atoz_html: "Name A to Z"
ztoa_html: "Name Z to A"
archived_new_html: "Archived last"
archived_old_html: "Archived first"
new_html: "<i class=\"fas fa-sort-numeric-up\"></i>&nbsp;&nbsp;Started last"
old_html: "<i class=\"fas fa-sort-numeric-down\"></i>&nbsp;&nbsp;Started first"
atoz_html: "<i class=\"fas fa-sort-alpha-down\"></i>&nbsp;&nbsp;Name A to Z"
ztoa_html: "<i class=\"fas fa-sort-alpha-up\"></i>&nbsp;&nbsp;Name Z to A"
archived_new_html: "<span class=\"fa-stack\"><i class=\"fas fa-long-arrow-alt-up\"></i><i class=\"fas fa-archive\"></i></span>Archived last"
archived_old_html: "<span class=\"fa-stack\"><i class=\"fas fa-long-arrow-alt-down\"></i><i class=\"fas fa-archive\"></i></span>Archived first"
sort_new:
new: "Newest"
old: "Oldest"