scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1121 from mlorb/ml-sci-2244

Browse source 
Update buttons positions and wording throughout app [SCI-2244]
This commit is contained in:
mlorb 2018-05-03 11:05:15 +02:00 committed by GitHub
parent b277501e6d ca022fead7
commit d2c0ae241e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 374 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/repository_columns/index.js.erb
View file

@ -109,10 +109,12 @@
html += 'data-edit-url="' + column.edit_url + '">';
html += '<span class="pull-left">' + column.name + '</span>';
html += '<span class="controlls pull-right">';
html += '<span class="glyphicon glyphicon-trash" aria-hidden="true" ';
html += 'data-action="destroy"></span>&nbsp;';
html += '<button class="btn btn-primary" data-action="edit">';
html += '<%= I18n.t "libraries.repository_columns.index.edit_column" %>';
html += '<button class="btn btn-default" data-action="edit">';
html += '<span class="glyphicon glyphicon-pencil"></span>&nbsp;';
html += '<%= I18n.t "libraries.repository_columns.index.edit_column" %></button>&nbsp;';
html += '<button class="btn btn-default" data-action="destroy">';
html += '<span class="glyphicon glyphicon-trash"></span>&nbsp;';
html += '<%= I18n.t "libraries.repository_columns.index.delete_column" %>';
html += '</button></span></li>';
$(html).insertBefore('.repository-columns-body ul li:first')
.promise()

4
app/assets/javascripts/sitewide/drag_n_drop.js.erb
View file

@ -137,8 +137,8 @@
html += 'placeholder="<%= I18n.t('assets.from_clipboard.file_name_placeholder') %>" aria-describedby="image-name">';
html += '<span class="input-group-addon" id="image-name"></span></div>';
html += '</div><div class="modal-footer">';
html += '<button type="button" class="btn btn-primary" data-action="addImageFormClipboard"><%= I18n.t('assets.from_clipboard.add_image') %></button>';
html += '<button type="button" class="btn btn-default" data-dismiss="modal"><%= I18n.t('general.cancel') %></button>'
html += '<button type="button" class="btn btn-default" data-dismiss="modal"><%= I18n.t('general.cancel') %></button>';
html += '<button type="button" class="btn btn-success" data-action="addImageFormClipboard"><%= I18n.t('assets.from_clipboard.add_image') %></button>';
html += '</div></div></div></div><!-- /.modal -->';
return $(html).appendTo($('body')).promise().done(function() {
// display modal

10
app/assets/javascripts/users/settings/account/preferences/index.js
View file

@ -75,10 +75,10 @@
for (var i = 0; i < notification_settings.length; i++ ) {
var setting = $('[name="' + notification_settings[i] + '"]');
var dependant = $('[name="' + notification_settings[i] + '_email"]');
dependant.checkboxpicker({ onActiveCls: 'btn-primary' });
dependant.checkboxpicker({ onActiveCls: 'btn-primary', offActiveCls: 'btn-primary' });
setting
.checkboxpicker({
onActiveCls: 'btn-primary'
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary'
}).change(function() {
if ( $(this).prop('checked') ) {
enableDependant($('[name="' + $(this).attr('name') + '_email"]'));
@ -100,7 +100,7 @@
function setEmailSwitch(setting) {
setting
.checkboxpicker({
onActiveCls: 'btn-primary'
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary'
});
if ( setting.attr('value') === 'true' ) {
setting.prop('checked', true);
@ -123,7 +123,7 @@
var system_message_notification = $('[name="system_message_notification"]');
system_message_notification
.checkboxpicker({
onActiveCls: 'btn-primary'
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary'
});
system_message_notification.prop('checked', true);
system_message_notification.prop('disabled', true);
@ -132,7 +132,7 @@
var system_message_notification_mail = $('[name="system_message_notification_email"]');
system_message_notification_mail
.checkboxpicker({
onActiveCls: 'btn-primary'
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary'
});
system_message_notification_mail.prop(
'checked',

9
app/assets/stylesheets/projects.scss
View file

@ -5,6 +5,14 @@
$color-group-hover: $brand-primary;
$color-module-hover: $brand-default;
#new-project-modal, #edit-project-modal {
.btn-group label.btn-primary:not(.active) {
background-color: $color-white;
border-color: $color-silver;
color: $color-emperor;
}
}
/* Canvas index page */
#canvas-container:not(.canvas-container-edit-mode) {
@ -430,6 +438,7 @@ li.module-hover {
.create-new-tag-btn {
margin-right: 15px;
margin-top: 10px;
}
}

36
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -116,17 +116,6 @@
width: 45px;
}
.notifications-dropdown-header {
background-color: $brand-primary;
color: $color-concrete;
font-weight: bold;
padding: 8px;
a {
color: $color-white;
}
}
.notifications-dropdown-footer {
background-color: $brand-primary-light;
padding: 8px;
@ -135,6 +124,18 @@
}
.notifications-dropdown-header,
.team-switch-dropdown-header {
background-color: $brand-primary;
color: $color-concrete;
font-weight: bold;
padding: 8px;
a {
color: $color-white;
}
}
.notification {
padding-right: 8px;
word-wrap: break-word;
@ -259,13 +260,13 @@
}
.glyphicon-ok-sign {
color: $brand-success;
color: $brand-primary;
margin-left: -10px;
margin-right: 10px;
}
.team-name-item {
border-bottom: 1px solid $color-silver-chalice;
border-bottom: 1px solid $color-gainsboro;
padding-bottom: 8px;
padding-top: 5px;
}
@ -274,7 +275,7 @@
border-bottom: 0;
}
.btn-default {
.btn-default:not(.dropdown-toggle) {
margin-left: 15px;
text-align: right;
width: 300px;
@ -285,13 +286,12 @@
}
.dropdown-menu {
border-radius: 0;
margin-top: 0;
padding-top: 0;
width: 100%;
}
.caret {
color: $color-white;
}
i {
margin-right: 5px;
}

12
app/assets/stylesheets/themes/repositories.scss
View file

@ -17,15 +17,6 @@
span {
margin-top: -10px;
}
.glyphicon-trash {
color: $brand-danger;
margin-right: 10px;
&:hover {
cursor: pointer;
}
}
}
}
@ -39,7 +30,8 @@
}
.custom-alert-info {
background-color: $brand-info;
background-color: $brand-danger-light;
margin: 10px 0;
padding: 10px;
}

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

@ -147,6 +147,10 @@ mark,.mark {
}
}
.align-right {
text-align: right;
}
a[data-toggle="tooltip"] {
color: inherit;
border-bottom: 1px dashed $color-emperor;
@ -681,6 +685,10 @@ ul.double-line > li {
margin-top: 50px;
}
.btn-more-activities {
margin-bottom: 15px;
}
/** Activity list resembling Bootstrap wells */
ul.content-activities {
@ -1400,6 +1408,10 @@ textarea.textarea-sm {
border: 1px solid $color-alto;
padding: 10px 10px 10px 0;
vertical-align: middle;
&.dropdown-header {
padding-left: 30px;
}
}
[data-position] {

1
app/controllers/my_modules_controller.rb
View file

@ -21,7 +21,6 @@ class MyModulesController < ApplicationController
samples repository archive)
before_action :check_manage_permissions,
only: %i(update destroy description due_date)
before_action :check_view_info_permissions, only: :show
before_action :check_view_permissions, only:
%i(show activities activities_tab protocols results samples samples_index
archive)

4
app/helpers/search_helper.rb
View file

@ -23,11 +23,11 @@ module SearchHelper
if search_team != current_team
link_to text,
path,
class: 'btn btn-primary',
class: 'btn btn-success',
data: { confirm: t('users.settings.changed_team_in_search',
team: search_team.name) }
else
link_to text, path, class: 'btn btn-primary'
link_to text, path, class: 'btn btn-success'
end
end
end

10
app/views/canvas/_edit.html.erb
View file

@ -10,17 +10,17 @@
>
<%= bootstrap_form_tag url: canvas_experiment_url, method: "post" do |f| %>
<div class="btn-group" role="group">
<%= f.submit class: "btn btn-primary", id: "canvas-save" do %>
<span class="visibile-xs"><%= t("experiments.canvas.edit.save_short") %></span>
<span class="hidden-xs"><%= t("experiments.canvas.edit.save") %></span>
<% end %>
<%= link_to canvas_experiment_path(@experiment), type: "button", class: "btn btn-default cancel-edit-canvas" do %>
<span class="hidden-xs"><%= t("experiments.canvas.edit.cancel") %></span>
<span class="glyphicon glyphicon-remove visible-xs" style="height: 16px;margin-top: 4px;">&nbsp;</span>
<% end %>
<%= f.submit class: "btn btn-success", id: "canvas-save" do %>
<span class="visibile-xs"><%= t("experiments.canvas.edit.save_short") %></span>
<span class="hidden-xs"><%= t("experiments.canvas.edit.save") %></span>
<% end %>
</div>
<% if can_manage_experiment?(@experiment) %>
<%=link_to "", type: "button", class: "btn btn-default", id: "canvas-new-module" do %>
<%=link_to "", type: "button", class: "btn btn-primary", id: "canvas-new-module" do %>
<span class="hbtn-default">
<span class="glyphicon glyphicon-credit-card"></span>
<%= t("experiments.canvas.edit.new_module") %>

4
app/views/canvas/edit/modal/_delete_module.html.erb
View file

@ -10,8 +10,10 @@
<span id="delete-message"></span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" data-action="confirm"><%=t "experiments.canvas.edit.modal_delete_module.confirm" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-danger" data-dismiss="modal" data-action="confirm">
<%=t "experiments.canvas.edit.modal_delete_module.confirm" %>
</button>
</div>
</div>
</div>

4
app/views/canvas/edit/modal/_delete_module_group.html.erb
View file

@ -10,8 +10,10 @@
<span id="delete-message"></span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" data-action="confirm"><%=t "experiments.canvas.edit.modal_delete_module_group.confirm" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-danger" data-dismiss="modal" data-action="confirm">
<%=t "experiments.canvas.edit.modal_delete_module_group.confirm" %>
</button>
</div>
</div>
</div>

2
app/views/canvas/edit/modal/_edit_module.html.erb
View file

@ -11,8 +11,8 @@
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_edit_module.confirm" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="confirm"><%=t "experiments.canvas.edit.modal_edit_module.confirm" %></button>
</div>
</div>
</div>

10
app/views/canvas/edit/modal/_move_module.html.erb
View file

@ -23,10 +23,12 @@
<% end %>
</div>
<div class="modal-footer">
<% if experiments.count > 1 %>
<button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_move_module.confirm" %></button>
<% end %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<% if experiments.count > 1 %>
<button type="button" class="btn btn-success" data-action="confirm">
<%=t "experiments.canvas.edit.modal_move_module.confirm" %>
</button>
<% end %>
</div>
</div>
</div>

6
app/views/canvas/edit/modal/_move_module_group.html.erb
View file

@ -24,9 +24,11 @@
</div>
<div class="modal-footer">
<% if experiments.count > 1 %>
<button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_move_module_group.confirm" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="confirm">
<%=t "experiments.canvas.edit.modal_move_module_group.confirm" %>
</button>
<% end %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
</div>
</div>
</div>

2
app/views/canvas/edit/modal/_new_module.html.erb
View file

@ -11,8 +11,8 @@
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" data-action="confirm"><%=t "experiments.canvas.edit.modal_new_module.confirm" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-dismiss="modal" data-action="confirm"><%=t "experiments.canvas.edit.modal_new_module.confirm" %></button>
</div>
</div>
</div>

2
app/views/experiments/_clone_modal.html.erb
View file

@ -26,8 +26,8 @@
{}, {class: "form-control selectpicker", "data-role" => "clear"} %>
</div>
<div class="modal-footer">
<%= f.submit t("experiments.clone.modal_submit"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.clone.modal_submit"), class: "btn btn-success" %>
</div>
</div>
</div>

2
app/views/experiments/_edit_modal.html.erb
View file

@ -15,8 +15,8 @@
<%= render partial: "form.html.erb", locals: { form: f } %>
</div>
<div class="modal-footer">
<%= f.submit t("experiments.edit.modal_create"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.edit.modal_create"), class: "btn btn-success" %>
</div>
</div>
</div>

6
app/views/experiments/_move_modal.html.erb
View file

@ -27,10 +27,10 @@
<%= t("experiments.move.notice") %>
</div>
<div class="modal-footer">
<% if !@projects.blank? %>
<%= f.submit t("experiments.move.modal_submit"), class: "btn btn-primary" %>
<% end %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<% if !@projects.blank? %>
<%= f.submit t("experiments.move.modal_submit"), class: "btn btn-success" %>
<% end %>
</div>
</div>
</div>

2
app/views/experiments/_new_modal.html.erb
View file

@ -11,8 +11,8 @@
<%= render partial: "form.html.erb", locals: { form: f } %>
</div>
<div class="modal-footer">
<%= f.submit t("experiments.new.modal_create"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.new.modal_create"), class: "btn btn-success" %>
</div>
</div>
</div>

3
app/views/my_module_tags/_index_edit.html.erb
View file

@ -62,7 +62,6 @@
{},
{ class: 'selectpicker' }) %>
<%= f.button class: 'btn btn-primary' do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%= t("experiments.canvas.modal_manage_tags.create") %></span>
<% end %>
</div>
@ -75,7 +74,7 @@
<%= f.hidden_field :name, :value => t("tags.create.new_name") %>
<%= f.hidden_field :color, :value => Constants::TAG_COLORS[0] %>
<%= f.button class: "btn btn-primary" do %>
<span class="glyphicon glyphicon-tag"></span>
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%=t "experiments.canvas.modal_manage_tags.create_new" %></span>
<% end %>
<% end %>

6
app/views/my_modules/_complete_task_modal.html.erb
View file

@ -16,12 +16,12 @@
<p><%=t 'my_modules.complete_modal.description' %></p>
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-primary"
data-action="complete"><%=t 'my_modules.buttons.complete' %></button>
<button type="button"
class="btn btn-default"
data-dismiss="modal"><%=t 'my_modules.complete_modal.leave_uncompleted' %></button>
<button type="button"
class="btn btn-success"
data-action="complete"><%=t 'my_modules.buttons.complete' %></button>
</div>
</div>
</div>

4
app/views/my_modules/_state_button_complete.html.erb
View file

@ -1,4 +1,4 @@
<button class="btn btn-primary">
<button class="btn btn-success">
<span class="glyphicon glyphicon-ok"></span>
<%= t("my_modules.buttons.complete") %>
</button>
</button>

2
app/views/my_modules/activities.html.erb
View file

@ -13,7 +13,7 @@
<!-- Load more activities -->
<% if @overflown %>
<div class="col-sm-8 fluid-content text-center">
<a class="btn btn-primary btn-more-activities" href="<%= @more_activities_url %>" data-remote="true">
<a class="btn btn-default btn-more-activities" href="<%= @more_activities_url %>" data-remote="true">
<%= t('my_modules.activities.more_activities') %></a>
</div>
<% end %>

4
app/views/my_modules/modals/_manage_description_modal.html.erb
View file

@ -7,9 +7,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%=t "general.update" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>
</div>
</div>
</div>

4
app/views/my_modules/modals/_manage_due_date_modal.html.erb
View file

@ -7,9 +7,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%=t "general.update" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>
</div>
</div>
</div>

4
app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
View file

@ -7,9 +7,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-success" data-action="submit"></button>
</div>
</div>
</div>
</div>
</div>

4
app/views/my_modules/protocols/_copy_to_repository_modal.html.erb
View file

@ -9,9 +9,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%= t("my_modules.protocols.copy_to_repository_modal.confirm") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-success" data-action="submit"><%= t("my_modules.protocols.copy_to_repository_modal.confirm") %></button>
</div>
</div>
</div>
</div>
</div>

4
app/views/my_modules/protocols/_load_from_repository_modal.html.erb
View file

@ -9,9 +9,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%= t("my_modules.protocols.load_from_repository_modal.load") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-success" data-action="submit"><%= t("my_modules.protocols.load_from_repository_modal.load") %></button>
</div>
</div>
</div>
</div>
</div>

5
app/views/my_modules/protocols/_protocol_buttons.html.erb
View file

@ -1,6 +1,9 @@
<div class="btn-group" role="group" aria-label="" style="margin-left: 15px;">
<div class="btn-group">
<a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#"><span class="glyphicon glyphicon-import"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.load_protocol") %></span></a>
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
<span class="glyphicon glyphicon-import"></span>
<span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.load_protocol") %></span>
</a>
<ul class="dropdown-menu">
<% if can_manage_protocol_in_module?(@protocol) %>
<li>

5
app/views/projects/index.html.erb
View file

@ -15,8 +15,8 @@
<%= render partial: "new.html.erb", locals: { form: f, teams: @teams } %>
</div>
<div class="modal-footer">
<%= f.submit t("projects.index.modal_new_project.create"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("projects.index.modal_new_project.create"), class: "btn btn-success" %>
</div>
</div>
</div>
@ -35,8 +35,8 @@
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%=t "projects.index.modal_edit_project.submit" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "projects.index.modal_edit_project.submit" %></button>
</div>
</div>
</div>
@ -64,6 +64,7 @@
<!-- project archive button -->
<a class="btn btn-default pull-right" href="<%= url_for projects_archive_path %>" id="project-archive-btn" data-turbolinks="false" title="<%= t'projects.index.archive' %>">
<span class="glyphicon glyphicon-briefcase" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.index.archive" %></span>
</a>
<% if @teams.length > 0 && can_create_projects?(current_team) %>

4
app/views/protocols/header/_edit_metadata_modal.html.erb
View file

@ -7,9 +7,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%=t "general.update" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>
</div>
</div>
</div>

3
app/views/protocols/import_export/_import_json_protocol_modal.html.erb
View file

@ -24,8 +24,7 @@
<% end %>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel')%></button>
<%= submit_tag t('protocols.index.modal_import_json_upload'), class: "btn
btn-primary", id: "pio_submit_btn_id" %>
<%= submit_tag t('protocols.index.modal_import_json_upload'), class: "btn btn-success", id: "pio_submit_btn_id" %>
</div>

3
app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
View file

@ -86,8 +86,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
<%= f.submit t('protocols.import_export.import_modal.import'),class: "btn
btn-primary" %>
<%= f.submit t('protocols.import_export.import_modal.import'),class: "btn btn-success" %>
<% end %>
</div>

10
app/views/protocols/import_export/_import_modal.html.erb
View file

@ -64,21 +64,21 @@
</div>
<div class="btn-group" role="group">
<div data-role="import-all">
<button type="submit" class="btn btn-primary" data-action="import-current"><%= t("protocols.import_export.import_modal.import_current") %></button>
<button type="submit" class="btn btn-default" data-action="import-all"><%= t("protocols.import_export.import_modal.import_all") %></button>
<button type="submit" class="btn btn-success" data-action="import-current"><%= t("protocols.import_export.import_modal.import_current") %></button>
<button type="submit" class="btn btn-success" data-action="import-all"><%= t("protocols.import_export.import_modal.import_all") %></button>
</div>
<div data-role="import-single">
<button type="submit" class="btn btn-primary" data-action="import-current"><%= t("protocols.import_export.import_modal.import") %></button>
<button type="submit" class="btn btn-success" data-action="import-current"><%= t("protocols.import_export.import_modal.import") %></button>
</div>
</div>
</div>
<div data-role="single-protocol-buttons">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<div class="btn-group" role="group">
<button type="submit" class="btn btn-primary" data-action="import-current"><%= t("protocols.import_export.import_modal.import") %></button>
<button type="submit" class="btn btn-success" data-action="import-current"><%= t("protocols.import_export.import_modal.import") %></button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

8
app/views/protocols/index.html.erb
View file

@ -23,7 +23,7 @@
<%= t(@type == :public ? "protocols.index.public_description" : "protocols.index.private_description") %>
</div>
<div class="btn-group" role="group">
<a class="btn btn-default" <%= can_create_protocols_in_repository?(@current_team) ? "data-action=create-new" : "disabled=disabled" %> data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>">
<a class="btn btn-primary" <%= can_create_protocols_in_repository?(@current_team) ? "data-action=create-new" : "disabled=disabled" %> data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>">
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.create_new") %></span>
</a>
@ -41,7 +41,7 @@
<span class="hidden-xs">&nbsp;<%= t("protocols.index.make_private") %></span>
</a>
<% elsif @type == :private %>
<a class="btn btn-primary" data-action="publish" data-url="<%= publish_protocols_path %>">
<a class="btn btn-default" data-action="publish" data-url="<%= publish_protocols_path %>">
<span class="glyphicon glyphicon-open"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.publish") %></span>
</a>
@ -54,7 +54,7 @@
aria-expanded="false"
href="#"
<%= 'disabled' unless can_create_protocols_in_repository?(@current_team) %>>
<span class="glyphicon glyphicon-import"></span><span class="hidden-xs">&nbsp;<%= "Import protocol" %></span></a>
<span class="glyphicon glyphicon-import"></span><span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span></a>
<% if can_create_protocols_in_repository?(@current_team) %>
<ul class="dropdown-menu">
<li>
@ -83,7 +83,7 @@
<div class="btn-group" role="group">
<a class="btn btn-default" data-action="archive" data-url="<%= archive_protocols_path %>">
<span class="glyphicon glyphicon-trash"></span>
<span class="glyphicon glyphicon-briefcase"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.archive_action") %></span>
</a>
</div>

4
app/views/protocols/index/_confirm_archive_modal.html.erb
View file

@ -11,9 +11,9 @@
<%= t("protocols.index.confirm_archive.message") %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%= t("protocols.index.confirm_archive.confirm") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-danger" data-action="submit"><%= t("protocols.index.confirm_archive.confirm") %></button>
</div>
</div>
</div>
</div>
</div>

4
app/views/protocols/index/_create_new_modal.html.erb
View file

@ -9,9 +9,9 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"><%= t("protocols.index.create.submit") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-success" data-action="submit"><%= t("protocols.index.create.submit") %></button>
</div>
</div>
</div>
</div>
</div>

9
app/views/reports/index.html.erb
View file

@ -59,8 +59,8 @@
<%=t "projects.reports.index.modal_delete.message" %>
</div>
<div class="modal-footer">
<%= f.button t("projects.reports.index.modal_delete.delete"), class: "btn btn-primary", id: "confirm-delete-reports-btn", name: nil %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.button t("projects.reports.index.modal_delete.delete"), class: "btn btn-danger", id: "confirm-delete-reports-btn", name: nil %>
</div>
</div>
</div>
@ -77,7 +77,6 @@
</div>
<div class="modal-body">
<p><%=t "projects.reports.index.modal_new.message" %></p>
<div class="form-group">
<label><%=t "projects.reports.index.modal_new.projects" %></label>
<% if @visible_projects&.length > 0 %>
@ -89,15 +88,15 @@
<% else %>
<p><%=t 'projects.reports.index.modal_new.no_projects' %></p>
<% end %>
</end>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button id="new-report-reports-btn"
class="btn btn-primary"
class="btn btn-success"
data-new-report-path="<%= @visible_projects.first.path if @visible_projects.first %>"
<%= 'disabled' unless @visible_projects&.length > 0 %>
><%=t 'projects.reports.index.modal_new.create' %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
</div>
</div>
</div>

4
app/views/reports/new.html.erb
View file

@ -47,8 +47,8 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" data-action="add" class="btn btn-primary"><%=t "projects.reports.elements.modals.add" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="add" class="btn btn-success"><%=t "projects.reports.elements.modals.add" %></button>
</div>
</div>
</div>
@ -64,8 +64,8 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" data-action="save" class="btn btn-primary"><%=t "projects.reports.elements.modals.save_report.save" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="save" class="btn btn-success"><%=t "projects.reports.elements.modals.save_report.save" %></button>
</div>
</div>
</div>

21
app/views/reports/new/_report_navigation.html.erb
View file

@ -13,25 +13,28 @@
</ul>
</div>
<%= link_to "", class: "btn btn-primary", remote: true, id: "print-report" do %>
<%= link_to "", class: "btn btn-default", remote: true, id: "print-report" do %>
<span class="glyphicon glyphicon-print"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_print" %></span>
<% end %>
<%= form_tag generate_project_reports_path(@project, format: :pdf), method: :post, target: "_blank", class: "get-report-pdf-form" do %>
<div class="form-group">
<%= hidden_field_tag "html", "" %>
<%= link_to "", class: "btn btn-primary", remote: true, id: "get-report-pdf" do %>
<%= link_to "", class: "btn btn-default", remote: true, id: "get-report-pdf" do %>
<span class="glyphicon glyphicon-save-file"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_pdf" %></span>
<% end %>
</div>
<% end %>
<%= link_to "", class: "btn btn-primary", remote: true, id: "save-report-link" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_save" %></span>
<% end %>
<%= link_to reports_path, data: { no_turbolink: false }, id: "cancel-report-link", class: "btn btn-default pull-right" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_close" %></span>
<% end %>
<div class="pull-right">
<%= link_to reports_path, data: { no_turbolink: false }, id: "cancel-report-link", class: "btn btn-default" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_close" %></span>
<% end %>
<%= link_to "", class: "btn btn-success", remote: true, id: "save-report-link" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_save" %></span>
<% end %>
</div>
</div>
</div>

1
app/views/repositories/_columns_reorder_dropdown.html.erb
View file

@ -1,6 +1,7 @@
<div id="repository-columns-dropdown" class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
<span class="glyphicon glyphicon-eye-open"></span>
<span class="hidden-xs"><%= t('repositories.index.visibility') %></span>
</button>
<ul class="dropdown-menu dropdown-menu-right smart-dropdown" id="repository-columns-list">
<li class="repository-columns-list-template hide">

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

@ -24,8 +24,8 @@
</div>
</div>
<div class="modal-footer">
<%= f.submit t("repositories.index.modal_copy.copy"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("repositories.index.modal_copy.copy"), class: "btn btn-success" %>
</div>
</div>
</div>

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

@ -15,8 +15,8 @@
placeholder: t("repositories.index.modal_create.name_placeholder") %>
</div>
<div class="modal-footer">
<%= f.submit t("repositories.index.modal_create.submit"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<%= f.submit t("repositories.index.modal_create.submit"), class: "btn btn-success" %>
</div>
</div>
</div>

4
app/views/repositories/_delete_record_modal.html.erb
View file

@ -9,10 +9,10 @@
<%= t("repositories.modal_delete_record.notice") %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="onClickDeleteRecord();">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-danger" data-dismiss="modal" onclick="onClickDeleteRecord();">
<%= t("repositories.modal_delete_record.delete") %>
</button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
</div>
</div>
</div>

4
app/views/repositories/_delete_repository_modal.html.erb
View file

@ -20,13 +20,13 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
<%= link_to t('repositories.index.modal_delete.delete'),
team_repository_path(id: @repository),
id: "confirm-repo-delete",
method: :delete,
type: 'button',
class: 'btn btn-primary' %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
class: 'btn btn-danger' %>
</div>
</div>
</div>

4
app/views/repositories/_export_repository_modal.html.erb
View file

@ -17,8 +17,8 @@
<div><%=t 'zip_export.repository_footer_html' %></div>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-primary' data-dismiss='modal' id='export-repositories'> <%=t 'my_modules.repository.export' %> </button>
<button type='button' class='btn btn-default' data-dismiss='modal' id='close-modal-export-repositories'><%= t('general.close')%></button>
<button type='button' class='btn btn-default' data-dismiss='modal' id='close-modal-export-repositories'><%= t('general.cancel')%></button>
<button type='button' class='btn btn-success' data-dismiss='modal' id='export-repositories'> <%=t 'my_modules.repository.export' %> </button>
</div>
</div>
</div>

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

@ -15,7 +15,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" onClick="pageReload()"><%= t('general.cancel')%></button>
<input type="submit" class="btn btn-primary" value="<%= t("repositories.modal_import.upload") %>">
<input type="submit" class="btn btn-success" value="<%= t("repositories.modal_import.upload") %>">
</div>
<% end %>
</div>

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

@ -71,7 +71,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" onClick="pageReload()"><%= t('general.cancel')%></button>
<input type="submit" class="btn btn-primary" value="<%= t('repositories.modal_parse.title') %>">
<input type="submit" class="btn btn-success" value="<%= t('repositories.modal_parse.import') %>">
</div>
<% end %>
</div>

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

@ -23,8 +23,8 @@
</div>
</div>
<div class="modal-footer">
<%= f.submit t("repositories.index.modal_rename.rename"), class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("repositories.index.modal_rename.rename"), class: "btn btn-success" %>
</div>
</div>
</div>

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

@ -82,7 +82,7 @@
</div>
<script>window.initPreviewModal()</script>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal"><%= t("general.close")%></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.close")%></button>
</div>
</div>
</div>

12
app/views/repositories/index.html.erb
View file

@ -11,11 +11,13 @@
<% if can_create_repositories?(current_team) %>
<h2><strong><%=t 'libraries.index.no_libraries.title' %><strong></h2>
<br />
<%= link_to t('libraries.index.no_libraries.create_new_button'),
create_modal_team_repositories_path(current_team),
class: "btn btn-primary btn-lg",
id: "create-new-repository",
remote: true %>
<a class="btn btn-primary btn-lg"
id="create-new-repository"
data-remote="true"
href="<%= create_modal_team_repositories_path(current_team) %>">
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%= t('libraries.index.no_libraries.create_new_button') %></span>
</a>
<% else %>
<h2><strong><%=t 'libraries.index.no_libraries.no_permission_title' %><strong></h2>
<% end %>

17
app/views/repositories/show.html.erb
View file

@ -7,7 +7,7 @@
<div id="repository-toolbar">
<% if can_create_repository_rows?(@repository.team) %>
<button type="button" class="btn btn-default editAdd" id="addRepositoryRecord" onclick="onClickAddRecord()">
<button type="button" class="btn btn-primary editAdd" id="addRepositoryRecord" onclick="onClickAddRecord()">
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%= t("repositories.add_new_record") %></span>
</button>
@ -22,6 +22,7 @@
aria-expanded="true"
<%= "disabled" unless can_perform_repository_actions(@repository) %>>
<span class="glyphicon glyphicon-cog"></span>
<span class="hidden-xs"><%= t('repositories.index.advanced') %></span>
<span class="caret"></span>
</div>
@ -84,11 +85,13 @@
<div id="datatables-buttons" style="display: inline;">
<div class="new-repository-button">
<% if can_create_repositories?(@repository.team) %>
<%= link_to t('libraries.index.no_libraries.create_new_button'),
create_modal_team_repositories_path(@repository.team),
class: "btn btn-default",
id: "create-new-repository",
remote: true %>
<a class="btn btn-default"
id="create-new-repository"
data-remote="true"
href="<%= create_modal_team_repositories_path(@repository.team) %>">
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%= t('libraries.index.no_libraries.create_new_button') %></span>
</a>
<% end %>
</div>
<%= render partial: "columns_reorder_dropdown", formats: :html %>
@ -96,7 +99,7 @@
</div>
<div class="btn-group inline" id="saveCancel" data-toggle="buttons" style="display:none">
<button type="button" class="btn btn-primary" id="saveRecord" onclick="onClickSave()">
<button type="button" class="btn btn-success" id="saveRecord" onclick="onClickSave()">
<span class="glyphicon glyphicon-save"></span>
<%= t("repositories.save_record") %>
</button>

2
app/views/repository_columns/_delete_column_modal.html.erb
View file

@ -8,8 +8,8 @@
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="delete"><%= t("repositories.modal_delete_column.delete") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-danger" data-action="delete"><%= t("repositories.modal_delete_column.delete") %></button>
</div>
</div>
</div>

2
app/views/repository_columns/_manage_column_modal.html.erb
View file

@ -54,8 +54,8 @@
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="save"><%= t("general.save") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-success" data-action="save"><%= t("general.save") %></button>
</div>
</div>
</div>

14
app/views/repository_columns/index.html.erb
View file

@ -35,12 +35,14 @@
data-edit-url="<%= edit_repository_repository_column_path(@repository, column) %>">
<span class="pull-left"><%= column.name %></span>
<span class="controlls pull-right">
<span class="glyphicon glyphicon-trash"
aria-hidden="true"
data-action="destroy"></span>&nbsp;
<button class="btn btn-primary" data-action="edit">
<%=t 'libraries.repository_columns.index.edit_column'%>
</button>
<button class="btn btn-default" data-action="edit">
<span class="glyphicon glyphicon-pencil"></span>
<%=t 'libraries.repository_columns.index.edit_column'%>
</button>
<button class="btn btn-default" data-action="destroy">
<span class="glyphicon glyphicon-trash"></span>
<%=t 'libraries.repository_columns.index.delete_column'%>
</button>
</span>
</li>
<% end %>

14
app/views/result_assets/_edit.html.erb
View file

@ -10,11 +10,13 @@
<%= ff.file_field :file %>
<% end %>
<hr>
<%= f.submit t("result_assets.edit.update"),
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.FILE, true);" %>
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>
</button>
<div class="align-right">
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>
</button>
<%= f.submit t("general.save"),
class: 'btn btn-success save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.FILE, true);" %>
</div>
<% end %>
</div>

32
app/views/result_assets/_new.html.erb
View file

@ -1,22 +1,28 @@
<div class="well">
<div id="new-result-assets-select"
class="text-center new-asset-box">
<%=t 'assets.drag_n_drop.label_html' %> <label><span class="btn btn-primary"><%=t 'assets.drag_n_drop.browse_label' %></span>
<input type="file"
onchange="DragNDropResults.init(this.files, 'select')"
id="drag-n-drop-assets"
style="display: none" multiple>
</label>
<div id="new-result-assets-select" class="text-center new-asset-box">
<%=t 'assets.drag_n_drop.label_html' %>
<label>
<span class="btn btn-primary">
<span class="glyphicon glyphicon-plus"></span>
<%=t 'assets.drag_n_drop.browse_label' %>
</span>
<input type="file"
onchange="DragNDropResults.init(this.files, 'select')"
id="drag-n-drop-assets"
style="display: none" multiple>
</label>
</div>
<br />
<button type="button"
class="btn btn-primary save-result"
disabled="true"
data-href="<%= my_module_result_assets_path(format: :json) %>"
onClick="DragNDropResults.processResult(this)"><%=t 'result_assets.new.create' %></button>
<div class="align-right">
<button type="button"
class="btn btn-default cancel-new"
onClick="DragNDropResults.destroyAll()">
<%= t("general.cancel")%>
</button>
<button type="button"
class="btn btn-success save-result"
disabled="true"
data-href="<%= my_module_result_assets_path(format: :json) %>"
onClick="DragNDropResults.processResult(this)"><%=t 'result_assets.new.create' %></button>
</div>
</div>

14
app/views/result_tables/_edit.html.erb
View file

@ -9,11 +9,13 @@
<% end %>
</div>
<hr>
<%= f.submit t("result_tables.edit.update"),
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TABLE, true);" %>
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>
</button>
<div class="align-right">
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>
</button>
<%= f.submit t("general.save"),
class: 'btn btn-success save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TABLE, true);" %>
</div>
<% end %>
</div>

14
app/views/result_tables/_new.html.erb
View file

@ -8,11 +8,13 @@
</div>
<% end %>
</div>
<%= f.submit t("result_tables.new.create"),
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TABLE, false);" %>
<button type="button" class="btn btn-default cancel-new">
<%= t("general.cancel")%>
</button>
<div class="align-right">
<button type="button" class="btn btn-default cancel-new">
<%= t("general.cancel")%>
</button>
<%= f.submit t("result_tables.new.create"),
class: 'btn btn-success save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TABLE, false);" %>
</div>
<% end %>
</div>

14
app/views/result_texts/_edit.html.erb
View file

@ -9,11 +9,13 @@
object_id: @result.result_text.id }) %>
</div>
<% end %><br />
<%= f.submit t("result_texts.edit.update"),
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TEXT, true);" %>
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>
</button>
<div class="align-right">
<button type="button" class="btn btn-default cancel-edit">
<%= t("general.cancel")%>
</button>
<%= f.submit t("general.save"),
class: 'btn btn-success save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TEXT, true);" %>
</div>
<% end %>
</div>

14
app/views/result_texts/_new.html.erb
View file

@ -7,11 +7,13 @@
object_id: @result.result_text.id }) %>
</div>
<% end %><br />
<%= f.submit t("result_texts.new.create"),
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TEXT, false);" %>
<button type="button" class="btn btn-default cancel-new">
<%= t("general.cancel")%>
</button>
<div class="align-right">
<button type="button" class="btn btn-default cancel-new">
<%= t("general.cancel")%>
</button>
<%= f.submit t("result_texts.new.create"),
class: 'btn btn-success save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TEXT, false);" %>
</div>
<% end %>
</div>

4
app/views/shared/_invite_users_modal.html.erb
View file

@ -110,12 +110,12 @@ invite_to_team = type.in?(%w(invite_to_team invite_to_team_with_role))
</button>
<!-- Invite buttons -->
<button type="button" data-role="invite-btn" class="btn btn-primary" disabled="disabled" data-action="invite">
<button type="button" data-role="invite-btn" class="btn btn-success" disabled="disabled" data-action="invite">
<%= t('invite_users.invite_btn') %>
</button>
<div class="btn-group" data-role="invite-with-role-div">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" data-id="invite-btn" aria-haspopup="true" aria-expanded="false" data-role="invite-with-role-btn" disabled="disabled">
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-id="invite-btn" aria-haspopup="true" aria-expanded="false" data-role="invite-with-role-btn" disabled="disabled">
<%= t('invite_users.invite_btn') %>
&nbsp;
<span class="caret"></span>

3
app/views/shared/_navigation.html.erb
View file

@ -23,7 +23,7 @@
<div class="btn-group">
<button type="button" class="btn btn-default"><%= truncate_team_name(current_team.name) %></button>
<button type="button"
class="btn btn-primary dropdown-toggle"
class="btn btn-default dropdown-toggle"
title="<%= t('nav.label.teams') %>"
data-toggle="dropdown"
aria-haspopup="true"
@ -37,6 +37,7 @@
url: user_current_team_path,
method: :post) do |f| %>
<%= hidden_field(:user, :current_team_id) %>
<div class="team-switch-dropdown-header"><%= t('nav.team_switch_title') %></div>
<% current_user.teams.each do |team| %>
<li class="team-name-item">
<a href="#"

10
app/views/steps/_edit.html.erb
View file

@ -4,9 +4,11 @@
<hr>
<%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
<hr>
<%= f.submit t("protocols.steps.edit.edit_step"), class: 'btn btn-primary step-save', onclick: "processStep(event, true);" %>
<a type="button" data-action="cancel-edit" class="btn btn-default" href="<%= step_path(id: @step, format: :json) %>" data-remote="true">
<%= t("general.cancel")%>
</a>
<div class="align-right">
<a type="button" data-action="cancel-edit" class="btn btn-default" href="<%= step_path(id: @step, format: :json) %>" data-remote="true">
<%= t("general.cancel")%>
</a>
<%= f.submit t("protocols.steps.edit.edit_step"), class: 'btn btn-success step-save', onclick: "processStep(event, true);" %>
</div>
<% end %>
</div>

7
app/views/steps/_empty_step.html.erb
View file

@ -43,7 +43,12 @@
</div>
<div class="tab-pane" role="tabpanel" id="new-step-assets">
<div class="text-center new-asset-box">
<%=t 'assets.drag_n_drop.label_html' %> <label><span class="btn btn-primary"><%=t 'assets.drag_n_drop.browse_label' %></span>
<%=t 'assets.drag_n_drop.label_html' %>
<label>
<span class="btn btn-primary">
<span class="glyphicon glyphicon-plus"></span>
<%=t 'assets.drag_n_drop.browse_label' %>
</span>
<input type="file"
onchange="DragNDropSteps.init(this.files)"
id="drag-n-drop-assets"

10
app/views/steps/_new.html.erb
View file

@ -4,9 +4,11 @@
<hr>
<%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
<hr>
<%= f.submit t("protocols.steps.new.add_step"), class: 'btn btn-primary step-save', onclick: "processStep(event, false);" %>
<button type="button" data-action="cancel-new" class="btn btn-default">
<%= t("general.cancel")%>
</button>
<div class="align-right">
<button type="button" data-action="cancel-new" class="btn btn-default">
<%= t("general.cancel")%>
</button>
<%= f.submit t("protocols.steps.new.add_step"), class: 'btn btn-success step-save', onclick: "processStep(event, false);" %>
</div>
<% end %>
</div>

2
app/views/steps/_step.html.erb
View file

@ -132,7 +132,7 @@
<div data-action="complete-step"
class="pull-right"
data-link-url="<%= toggle_step_state_step_path(step)%>">
<button class="btn btn-primary"><%= t("protocols.steps.options.complete_title") %></button>
<button class="btn btn-success"><%= t("protocols.steps.options.complete_title") %></button>
</div>
<% end %>
<% end %>

20
app/views/users/registrations/edit.html.erb
View file

@ -46,9 +46,9 @@
<%= f.label :avatar, t("users.registrations.edit.avatar_edit_label") %>
<%= f.file_field :avatar, class: "btn btn-default" %>
</div>
<div>
<div class="align-right">
<a href="#" class="btn btn-default" data-action="cancel"><%=t "general.cancel" %></a>
<%= f.submit t("users.registrations.edit.avatar_submit"), class: 'btn btn-primary', onclick: "processFile(event);" %>
<%= f.submit t("users.registrations.edit.avatar_submit"), class: 'btn btn-success', onclick: "processFile(event);" %>
</div>
</div>
</div>
@ -76,9 +76,9 @@
<%= f.label :full_name, t("users.registrations.edit.name_label") %>
<%= f.text_field :full_name, class: "form-control", "data-role" => "edit" %>
</div>
<div>
<div class="align-right">
<a href="#" class="btn btn-default" data-action="cancel"><%=t "general.cancel" %></a>
<%= f.submit t("general.update"), class: "btn btn-primary" %>
<%= f.submit t("general.save"), class: "btn btn-success" %>
</div>
</div>
</div>
@ -107,9 +107,9 @@
<%= f.label :initials, t("users.registrations.edit.initials_label") %>
<%= f.text_field :initials, class: "form-control", "data-role" => "edit" %>
</div>
<div>
<div class="align-right">
<a href="#" class="btn btn-default" data-action="cancel"><%=t "general.cancel" %></a>
<%= f.submit t("general.update"), class: "btn btn-primary" %>
<%= f.submit t("general.save"), class: "btn btn-success" %>
</div>
</div>
</div>
@ -148,9 +148,9 @@
<%= f.label :current_password, t("users.registrations.edit.current_password_label") %> <i><%=t "users.registrations.edit.password_explanation" %></i>
<%= f.password_field :current_password, autocomplete: "off", class: "form-control", "data-role" => "clear", id: 'edit-email-current-password' %>
</div>
<div>
<div class="align-right">
<a href="#" class="btn btn-default" data-action="cancel"><%=t "general.cancel" %></a>
<%= f.submit t("general.update"), class: "btn btn-primary" %>
<%= f.submit t("general.save"), class: "btn btn-success" %>
</div>
</div>
</div>
@ -191,9 +191,9 @@
<%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control", "data-role" => "clear" %>
</div>
<div>
<div class="align-right">
<a href="#" class="btn btn-default" data-action="cancel"><%=t "general.cancel" %></a>
<%= f.submit t("general.update"), class: "btn btn-primary" %>
<%= f.submit t("general.save"), class: "btn btn-success" %>
</div>
</div>
</div>

2
app/views/users/settings/account/preferences/index.html.erb
View file

@ -43,7 +43,7 @@
</div>
<div>
<a href="#" class="btn btn-default" data-action="cancel"><%=t "general.cancel" %></a>
<%= f.submit t("general.update"), class: "btn btn-primary" %>
<%= f.submit t("general.save"), class: "btn btn-success" %>
</div>
</div>
</div>

2
app/views/users/settings/teams/_description_modal.html.erb
View file

@ -14,7 +14,7 @@
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-primary" data-action="submit"><%=t "general.update" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>
</div>

2
app/views/users/settings/teams/_destroy_modal.html.erb
View file

@ -15,7 +15,7 @@
<div class="modal-footer">
<%= bootstrap_form_tag url: destroy_team_path(team), method: :delete do |f| %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
<%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-primary" %>
<%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-danger" %>
<% end %>
</div>
</div>

2
app/views/users/settings/teams/_name_modal.html.erb
View file

@ -14,7 +14,7 @@
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button" class="btn btn-primary" data-action="submit"><%=t 'general.update' %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t 'general.save' %></button>
</div>
</div>
</div>

2
app/views/users/settings/teams/index.html.erb
View file

@ -15,7 +15,7 @@
<% end %>
<% if can_create_teams? %>
<span id="new-team-button">
<%= link_to new_team_path, class: "btn btn-default", style: "margin-left: 30px;" do %>
<%= link_to new_team_path, class: "btn btn-primary", style: "margin-left: 30px;" do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs">
<%= t("users.settings.teams.index.new_team") %>

2
app/views/users/settings/teams/new.html.erb
View file

@ -26,7 +26,7 @@
</div>
<%= link_to t('general.cancel'), teams_path, class: 'btn btn-default' %>
<%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-primary' %>
<%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-success' %>
<% end %>
</div>

2
app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
View file

@ -14,7 +14,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button"
class="btn btn-primary"
class="btn btn-danger"
data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %></button>
</div>
</div>

2
app/views/users/settings/user_teams/_leave_user_team_modal.html.erb
View file

@ -17,7 +17,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
<button type="button"
class="btn btn-primary"
class="btn btn-danger"
data-action="submit"><%= t('users.settings.user_teams.leave_uo_confirm') %></button>
</div>
</div>

137
config/locales/en.yml
View file

@ -67,6 +67,7 @@ en:
body:
notice: "You need to enable JavaScript to run this app."
nav:
team_switch_title: "Switch team"
search: "Search for something..."
search_button: 'Go!'
user_greeting: "Hi, %{full_name}"
@ -201,7 +202,7 @@ en:
index:
head_title: "Home"
archive: "Archive"
new: "New project"
new: "New Project"
visibility_private: "Project is private. Only invited users can see it."
visibility_public: "Project is public. Everybody from the team can see it."
user_project: "%{user} joined on %{timestamp}."
@ -236,7 +237,7 @@ en:
content_loading: "Loading..."
edit_option: "Edit"
archive_option: "Archive"
archive_confirm: "Are you sure to archive project?"
archive_confirm: "Are you sure you want to archive this project?"
restore_option: "Restore"
options_header: "Options"
comment_placeholder: "Your Message"
@ -245,7 +246,7 @@ en:
back_to_projects_index: "Back to home"
modal_new_project:
modal_title: "Create new project"
create: "Create project"
create: "Create"
name: "Project name"
name_placeholder: "My project"
team: "Team"
@ -254,7 +255,7 @@ en:
visibility_visible: "Public"
modal_edit_project:
modal_title: "Edit project %{project}"
submit: "Update project"
submit: "Save"
modal_manage_users:
modal_title: "Manage users for"
no_users: "No users!"
@ -266,7 +267,7 @@ en:
no_teams:
title: "Your dashboard is empty!"
text: "It seems you're not a member of any team. See team management to sort it out."
btn: "Manage teams"
btn: "Manage Teams"
create:
success_flash: "Project <strong>%{name}</strong> successfully created."
name_taken: "This project name has to be unique inside a team (this includes the archive)."
@ -289,9 +290,9 @@ en:
print_title: "%{project} | Report"
index:
head_title: " Reports"
new: "New report"
edit: "Edit report"
delete: "Delete report/s"
new: "New"
edit: "Edit"
delete: "Delete"
thead_project_name: "Project name"
thead_name: "Report name"
thead_created_by: "Created by"
@ -316,7 +317,7 @@ en:
nav_pdf: "Download PDF"
nav_save: "Save"
nav_close: "Close"
nav_sort_by: "Sort report by"
nav_sort_by: "Sort by"
nav_sort_asc: "Oldest on top"
nav_sort_desc: "Newest on top"
nav_sort: "Sort"
@ -381,7 +382,7 @@ en:
instructions: "Include result/s comments in the report?"
check_all: "All results content"
comments: "Comments"
add: "Add to report"
add: "Add"
save_report:
head_title: "Save report"
name: "Report name"
@ -490,8 +491,8 @@ en:
my_modules:
buttons:
complete: "Complete task"
uncomplete: "Uncomplete task"
complete: "Complete Task"
uncomplete: "Uncomplete Task"
complete_modal:
description: 'You have completed all steps in the task. Would you like to mark entire task as completed?'
leave_uncompleted: 'Leave task in progress'
@ -568,11 +569,11 @@ en:
title: "Newer version in repository and task"
text: "There is a newer <a href='#' data-toggle='tooltip' data-placement='below' title='Last modified at %{parent_ts}'>version</a> of this protocol in the repository. This <a href='#' data-toggle='tooltip' data-placement='below' title='Last modified at %{self_ts}'>version</a> of protocol is newer than the version stored in protocol repository."
buttons:
load_protocol: "Load protocol"
load_protocol: "Load Protocol"
load_protocol_from_repository: "from repository"
load_protocol_from_file: "from file"
export: "Export protocol"
copy_to_repository: "Save to protocol repository"
export: "Export Protocol"
copy_to_repository: "Save To Protocol Repository"
confirm_link_update_modal:
unlink_title: "Unlink protocol"
unlink_message: "Are you sure you want to unlink the task protocol from the repository version? This will stop any tracking of changes."
@ -626,7 +627,7 @@ en:
link_label: "Link task to this repository protocol"
link_text: "<strong>Warning!</strong>&nbsp;This will unlink the currently linked protocol."
error_400: "Due to unknown error, protocol could not be copied to repository."
confirm: "Copy to repository"
confirm: "Copy"
load_from_file_flash: "Successfully loaded the protocol from the file."
load_from_file_error: "Failed to load the protocol from file."
load_from_file_error_locked: "Failed to load the protocol from file. One or more files are currently being edited."
@ -643,8 +644,8 @@ en:
published_table: "entered a table on %{timestamp}."
published_text: "entered a text on %{timestamp}."
published_asset: "uploaded a file on %{timestamp}."
expand_label: "Expand all"
collapse_label: "Collapse all"
expand_label: "Expand All"
collapse_label: "Collapse All"
empty_name: "Add title"
archive_confirm: "Are you sure to archive result?"
info_tab: "Info"
@ -659,16 +660,16 @@ en:
activities:
head_title: "%{project} | %{module} | Activity"
no_activities: "There are no activities for this task."
more_activities: "Load older activities"
more_activities: "More activities"
repository:
head_title: "%{project} | %{module} | Inventory %{repository}"
export: 'Export'
experiments:
new:
create: 'New experiment'
create: 'New Experiment'
modal_title: 'Create new experiment'
modal_create: 'Create experiment'
modal_create: 'Create'
name: 'Experiment name'
name_placeholder: 'My experiment'
description: 'Description'
@ -694,7 +695,7 @@ en:
clone:
modal_title: 'Copy experiment %{experiment} as template'
label_title: 'Copy as template (only Protocols steps copied)'
modal_submit: 'Copy as template'
modal_submit: 'Copy'
success_flash: 'Successfully copied experiment %{experiment} as template.'
error_flash: 'Could not copy the experiment as template.'
current_project: '(current project)'
@ -710,7 +711,7 @@ en:
archive_confirm: "Are you sure to archive this experiment?"
actions: 'Actions'
head_title: "%{project} | Overview"
canvas_edit: "Edit experiment"
canvas_edit: "Edit Experiment"
zoom: "Zoom: "
reload_on_submit: "Save action is running. Reloading this page may cause unexpected behavior."
modal_manage_tags:
@ -722,8 +723,8 @@ en:
delete_tag: "Permanently delete tag from all tasks."
save_tag: "Save tag."
cancel_tag: "Cancel changes to the tag."
create: "Add tag"
create_new: "Create new tag"
create: "Add"
create_new: "New"
edit:
new_module: "New task"
new_module_hover: "Drag me onto canvas"
@ -744,26 +745,26 @@ en:
title: "Add new task"
name: "Task name"
name_placeholder: "My task"
confirm: "Add task"
confirm: "Add"
modal_edit_module:
title: "Rename task"
name: "Task name"
confirm: "Rename task"
confirm: "Rename"
modal_move_module:
title: "Move task to experiment"
confirm: "Move task"
confirm: "Move"
no_experiments: "There are no other experiments."
modal_move_module_group:
title: "Move workflow to experiment"
confirm: "Move workflow"
confirm: "Move"
no_experiments: "There are no other experiments."
modal_delete_module:
title: "Archive task"
confirm: "Archive task"
confirm: "Archive"
message: "Are you sure you wish to archive task %{module}? Task's samples and position will be removed."
modal_delete_module_group:
title: "Archive workflow"
confirm: "Archive workflow"
confirm: "Archive"
message: "Are you sure you wish to archive the workflow task %{module} belongs to? All workflow tasks' samples and positions will be removed."
popups:
info_tab: "Task info"
@ -826,11 +827,11 @@ en:
new:
head_title: "%{project} | %{module} | Add text result"
title: "Add result to task %{module}"
create: "Add text result"
create: "Add"
edit:
head_title: "%{project} | %{module} | Edit text result"
title: "Edit result from task %{module}"
update: "Update text result"
update: "Update"
create:
success_flash: "Successfully added text result to task <strong>%{module}</strong>"
update:
@ -844,12 +845,12 @@ en:
new:
head_title: "%{project} | %{module} | Add file result"
title: "Add result to task %{module}"
create: "Add file result"
create: "Add"
edit:
head_title: "%{project} | %{module} | Edit file result"
title: "Edit result from task %{module}"
uploaded_asset: "Uploaded file"
update: "Update file result"
update: "Update"
locked_file_error: 'This file is being edited by someone else.'
create:
success_flash: "Successfully added file result to task <strong>%{module}</strong>"
@ -868,11 +869,11 @@ en:
new:
head_title: "%{project} | %{module} | Add table result"
title: "Add result to task %{module}"
create: "Add table result"
create: "Add"
edit:
head_title: "%{project} | %{module} | Edit table result"
title: "Edit result from task %{module}"
update: "Update table result"
update: "Update"
create:
success_flash: "Successfully added table result to task <strong>%{module}</strong>"
update:
@ -894,6 +895,8 @@ en:
no_teams:
title: "Your dashboard is empty!"
text: "It seems you're not a member of any team. See team management to sort it out."
visibility: "Visibility"
advanced: "Advanced"
options_dropdown:
header: "Edit inventory"
rename: "Rename"
@ -906,23 +909,23 @@ en:
alert_heading: "Deleting inventory has following consequences:"
alert_line_1: "all data inside the inventory will be lost;"
alert_line_2: "all references to inventory items will be rendered as invalid."
delete: "Delete inventory"
delete: "Delete"
modal_rename:
title_html: "Rename inventory <em>%{name}</em>"
name: "New inventory name"
name_placeholder: "My inventory"
rename: "Rename inventory"
rename: "Rename"
modal_copy:
title_html: "Copy inventory <em>%{name}</em>"
name: "New inventory name"
description: "Only the structure of the inventory is going to be copied."
name_placeholder: "My inventory"
copy: "Copy inventory"
copy: "Copy"
modal_create:
title: "Create new inventory"
name_label: "Inventory name"
name_placeholder: "My inventory"
submit: "Create inventory"
submit: "Create"
success_flash: "Inventory <strong>%{name}</strong> successfully created."
table:
id: 'ID'
@ -930,7 +933,7 @@ en:
row_name: "Name"
added_on: "Added on"
added_by: "Added by"
add_new_record: "Add new item"
add_new_record: "New item"
import_records:
import: 'Import'
no_header_name: 'No column name'
@ -957,27 +960,28 @@ en:
columns_delete: "Delete"
columns_reorder: "Re-Order Columns"
columns_visibility: "Visible columns"
view_all_records: "View all items"
view_assigned_records: "View assigned items"
view_all_records: "View All Items"
view_assigned_records: "View Assigned Items"
modal_delete_record:
title: "Delete items"
notice: "Are you sure you want to delete the selected item(s)?"
delete: "Delete item(s)"
delete: "Delete"
modal_delete_column:
title: "Delete a column"
message: "Are you sure you wish to permanently delete selected column %{column}? This action is irreversible."
alert_heading: "Deleting a column has following consequences:"
alert_line_1: "you will lose information in this column for %{nr} item(s);"
alert_line_2: "the column will be deleted for all team members."
delete: "Delete column"
delete: "Delete"
modal_parse:
title: 'Import items'
warning_1: 'Be careful when importing into Dropdown column/s! Each new unique cell value from the file will create a new Dropdown option. Maximum nr. of Dropdown options is %{limit}.'
warning_2: 'Importing into file columns is not supported.'
import: 'Import'
modal_import:
title: 'Import items'
notice: 'You may upload .csv file (comma separated) or tab separated file (.txt or .tsv) or Excel file (.xlsx). First row should include header names, followed by rows with sample data.'
upload: 'Upload file'
upload: 'Upload'
js:
permission_error: "You don't have permission to edit this item."
not_found_error: "This inventory item does not exist."
@ -1024,8 +1028,9 @@ en:
error_flash: "Something went wrong! Please try again later."
index:
manage_column: "Manage Columns"
new_column: "New"
new_column: "New Column"
no_column: "No columns"
delete_column: "Delete"
edit_column: "Edit"
back_to_repository_html: "<span class='glyphicon glyphicon-chevron-left'></span> Back to %{repository}"
sidebar:
@ -1036,7 +1041,7 @@ en:
no_permission_title: "You don't have permission to create new inventory. Please contact your team administrator."
text: "You don't have any inventories."
title: "Please create your first Inventory"
create_new_button: "Create New Inventory"
create_new_button: "New Inventory"
show:
head_title: "Inventories | %{library}"
repository_row:
@ -1327,7 +1332,7 @@ en:
head_title: "My profile"
title: "My profile"
avatar_label: "Avatar"
avatar_btn: "Edit avatar"
avatar_btn: "Edit Avatar"
avatar_title: "Change avatar"
avatar_edit_label: "Upload new avatar file"
avatar_submit: "Upload"
@ -1392,7 +1397,7 @@ en:
one: "You are member of %{count} team."
other: "You are member of %{count} teams."
no_teams: "You are not a member of any team."
new_team: "New team"
new_team: "New Team"
thead_name: "Team"
thead_role: "Role"
thead_created_at: "Created at"
@ -1406,7 +1411,7 @@ en:
name_sublabel: "Pick a name that would best describe your team (e.g. 'University of ..., Department of ...')."
description_label: "Description"
description_sublabel: "Describe your team."
create: "Create team"
create: "Create"
edit:
header_created_at: "Created on:"
header_created_by: "Created by:"
@ -1451,7 +1456,7 @@ en:
destroy_uo_alert_line_1: "user will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
destroy_uo_alert_line_2: "all projects in the team where user was the sole <b>Owner</b> will be reassigned onto you as a new owner;"
destroy_uo_alert_line_3: "all repository protocols in the team belonging to user will be reassigned onto you."
destroy_uo_confirm: "Remove user"
destroy_uo_confirm: "Remove"
leave_flash: "Successfuly left team %{team}."
protocols:
@ -1566,13 +1571,13 @@ en:
archive: "Archive"
public_description: "Public protocols are visible and can be used by everyone from the team."
private_description: "Private protocols are only visible to you."
create_new: "Create new"
create_new: "New"
edit: "Edit"
clone_btn: "Copy"
import: "Import"
import_alt: " from SciNote protocol file(.eln)"
import_json: " from protocols.io file"
modal_import_json_upload: "Upload file"
modal_import_json_upload: "Upload"
modal_import_json_title: "Import protocols.io file"
modal_import_json_notice: "Upload your protocols.io protocol file"
export: "Export"
@ -1601,7 +1606,7 @@ en:
no_teams:
title: "Your dashboard is empty!"
text: "It seems you're not a member of any team. See team management to sort it out."
btn: "Manage teams"
btn: "Manage Teams"
make_private_unauthorized: "You do not have permission to make selected protocols private."
make_private_error: "Error occured while making selected protocols private."
publish_unauthorized: "You do not have permission to publish selected protocols."
@ -1670,9 +1675,9 @@ en:
steps:
completed: 'Completed'
uncompleted: 'Uncompleted'
expand_label: "Expand all"
collapse_label: "Collapse all"
new_step: "Add new"
expand_label: "Expand All"
collapse_label: "Collapse All"
new_step: "New Step"
subtitle: "Protocol steps"
no_steps: "Protocol has no steps."
published_on: "Published on <em>%{timestamp}</em> by <em>%{user}</em>"
@ -1692,8 +1697,8 @@ en:
edit_title: "Edit step"
delete_title: "Delete step"
duplicate_title: "Duplicate step"
complete_title: "Complete step"
uncomplete_title: "Uncomplete step"
complete_title: "Complete Step"
uncomplete_title: "Uncomplete Step"
new:
add_step_title: "Add new step"
tab_checklists: "Checklists"
@ -1737,10 +1742,10 @@ en:
heading: "Invite more people to start using sciNote."
input_subtitle: "Input one or multiple emails, confirm each email with ENTER key."
invite_to_team_heading: "Invite users to my team:"
invite_btn: "Invite user/s"
invite_guest: "as Guest/s"
invite_user: "as Normal user/s"
invite_admin: "as Administrator/s"
invite_btn: "Invite Users"
invite_guest: "As Guests"
invite_user: "As Normal Users"
invite_admin: "As Administrators"
results:
heading: "Invitation results:"
user_exists: "User is already a member of sciNote."
@ -1825,7 +1830,7 @@ en:
from_clipboard:
modal_title: 'Add image from clipboard'
image_preview: 'Image preview'
add_image: 'Add image'
add_image: 'Add'
file_name: 'File name'
file_name_placeholder: 'Image'
atwho:

8
features/sessions/sign_up.feature
View file

@ -16,7 +16,7 @@ Feature: Sign up
Then I fill the sign up form with
| Full name | Email | Password | Password confirmation | Team name |
| Magnus | tusk@gmail.com | asdf1234 | asdf1234 | SpliceGirls |
And I click "Sign up" button
And I click on "Sign up"
Then I should see "has already been taken"
@javascript
@ -25,7 +25,7 @@ Feature: Sign up
Then I fill the sign up form with
| Full name | Email | Password | Password confirmation | Team name |
| Magnus | magnus@gmail.com | asdf1234 | asdf1234 | SpliceGirls |
And I click "Sign up" button
And I click on "Sign up"
Then I should see "SpliceGirls"
And I should be on homepage
@ -35,7 +35,7 @@ Feature: Sign up
Then I fill the sign up form with
| Full name | Email | Password | Password confirmation | Team name |
| Magnus | magnus@gmail.com | asdf1234 | asdf1234567 | SpliceGirls |
And I click "Sign up" button
And I click on "Sign up"
Then I should see "doesn't match Password"
@javascript
@ -44,5 +44,5 @@ Feature: Sign up
Then I fill the sign up form with
| Full name | Email | Password | Password confirmation |
| Magnus | magnus@gmail.com | asdf1234 | asdf1234 |
And I click "Sign up" button
And I click on "Sign up"
Then I should see "is too short (minimum is 2 characters)"

20
features/settings_page/profile.feature
View file

@ -23,7 +23,7 @@ Scenario: Unsuccessful avatar image upload, file is too big
Given I'm on the profile page
Then I click on image within ".avatar-container" element
And I attach a "Moon.png" file to "user_avatar" field
And I click "Upload" button
And I click on "Upload"
And I should see "Your avatar file cannot be larger than 0.2 MB. (Please try again with a smaller file.)" error message
@javascript
@ -31,7 +31,7 @@ Scenario: Unsuccessful avatar image upload, file is invalid
Given I'm on the profile page
Then I click on image within ".avatar-container" element
And I attach a "File.txt" file to "user_avatar" field
And I click "Upload" button
And I click on "Upload"
And I should see "Avatar content type is invalid" error message
@javascript
@ -47,7 +47,7 @@ Scenario: Successfully changes user full name
Given I'm on the profile page
Then I click on Edit on ".settings-page-full-name" input field
And I fill in "Karli Novak Novakovic" in ".settings-page-full-name" input field
Then I click "Update" button
Then I click "Save" button
And I should see "Karli Novak Novakovic" in ".settings-page-full-name" input field
@javascript
@ -55,7 +55,7 @@ Scenario: Unsuccessfully changes user initials, text is too long
Given I'm on the profile page
Then I click on Edit on ".settings-page-initials" input field
And I fill in "KNOCK" in ".settings-page-initials" input field
Then I click "Update" button
Then I click "Save" button
And I should see "is too long (maximum is 4 characters)" error message
@javascript
@ -63,7 +63,7 @@ Scenario: Successfully changes user initials
Given I'm on the profile page
Then I click on Edit on ".settings-page-initials" input field
And I fill in "KN" in ".settings-page-initials" input field
Then I click "Update" button
Then I click "Save" button
And I should see "KN" in ".settings-page-initials" input field
@javascript
@ -72,7 +72,7 @@ Scenario: Successfully changes user email
Then I click on Edit on ".settings-page-email" input field
And I change "nonadmin@myorg.com" with "user@myorg.com" email
And I fill in "mypassword1234" in "#edit-email-current-password" field of ".settings-page-email" form
Then I click "Update" button
Then I click "Save" button
And I should see "user@myorg.com" in ".settings-page-email" input field
@javascript
@ -82,7 +82,7 @@ Scenario: Unsuccessful Password Change, password is too short
And I fill in "mypassword1234" in "#edit-password-current-password" field of ".settings-page-change-password" form
And I fill in "mypass" in "#user_password" field of ".settings-page-change-password" form
And I fill in "mypass" in "#user_password_confirmation" field of ".settings-page-change-password" form
Then I click "Update" button
Then I click "Save" button
And I should see "is too short (minimum is 8 characters)"
@javascript
@ -92,7 +92,7 @@ Scenario: Unsuccessful Password Change, passwords does not match
And I fill in "mypassword1234" in "#edit-password-current-password" field of ".settings-page-change-password" form
And I fill in "mypassword5678" in "#user_password" field of ".settings-page-change-password" form
And I fill in "mypassword56788" in "#user_password_confirmation" field of ".settings-page-change-password" form
Then I click "Update" button
Then I click "Save" button
And I should see "doesn't match"
@javascript
@ -102,7 +102,7 @@ Scenario: Unsuccessful Password Change, current password is invalid
And I fill in "mypassword123" in "#edit-password-current-password" field of ".settings-page-change-password" form
And I fill in "mypassword5678" in "#user_password" field of ".settings-page-change-password" form
And I fill in "mypassword5678" in "#user_password_confirmation" field of ".settings-page-change-password" form
Then I click "Update" button
Then I click "Save" button
And I should see "is invalid"
@javascript
@ -112,5 +112,5 @@ Scenario: Successful Password Change
And I fill in "mypassword1234" in "#edit-password-current-password" field of ".settings-page-change-password" form
And I fill in "mypassword5678" in "#user_password" field of ".settings-page-change-password" form
And I fill in "mypassword5678" in "#user_password_confirmation" field of ".settings-page-change-password" form
Then I click "Update" button
Then I click "Save" button
And I should see "Password successfully updated." flash message

8
features/settings_page/team.feature
View file

@ -20,7 +20,7 @@ Feature: Team settings
Given I'm on "BioSistemika Process" team settings page
Then I click on team title
And I change "BioSistemika Process" with "BioSistemika Process Company" in "team-name-modal" input field
Then I click "Update" button
Then I click "Save" button
And I should see "BioSistemika Process Company" on "#team-name" element
@javascript
@ -28,7 +28,7 @@ Feature: Team settings
Given I'm on "BioSistemika Process" team settings page
Then I click on ".description-label" element
And I fill in "I was on Triglav one summer." in "team_description" textarea field
Then I click "Update" button
Then I click "Save" button
And I should see "I was on Triglav one summer." on ".description-label" element
@javascript
@ -36,7 +36,7 @@ Feature: Team settings
Given I'm on "BioSistemika Process" team settings page
Then I click on ".description-label" element
And I change "Lorem ipsum dolor sit amet, consectetuer adipiscing eli." with "I was on Triglav one summer." in "team_description" textarea field
Then I click "Update" button
Then I click "Save" button
And I should see "I was on Triglav one summer." on ".description-label" element
@javascript
@ -66,5 +66,5 @@ Feature: Team settings
Then I click on "suazana@myorg.com" action button within Team members table
And I click "Remove" link within "suazana@myorg.com" actions dropdown within Team members table
And I should see "Are you sure you wish to remove user Suazana Novak from team BioSistemika Process?"
Then I click "Remove user" button
Then I click "Remove" button
Then I should not see "suazana@myorg.com" in Team members table

2
features/step_definitions/shared_steps.rb
View file

@ -1,5 +1,5 @@
When(/^I click "(.+)" button$/) do |button|
click_on(button)
click_button(button)
end
Given(/^Show me the page$/) do