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

Add reports and missed modals

Browse source
This commit is contained in:
aignatov-bio 2019-12-04 14:19:19 +01:00
parent ef3814ccec
commit a281f09e7f
21 changed files with 52 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/projects/index.js
View file

@ -519,6 +519,9 @@
refreshCurrentView(); refreshCurrentView();
} }
projectsChanged = false; projectsChanged = false;
})
.on('click', function() {
$(this).next().click();
}); });
} }

4
app/assets/javascripts/sidebar_toggle.js.erb
View file

@ -7,7 +7,7 @@
$('#wrapper').removeClass('hidden2'); $('#wrapper').removeClass('hidden2');
$('#wrapper').css('paddingLeft', '280px'); $('#wrapper').css('paddingLeft', '280px');
$('.navbar-secondary').css( $('.navbar-secondary').css(
{ 'margin-left': '-280px', 'padding-left': '294px' } { 'margin-left': '-280px', 'padding-left': '280px' }
); );
$('#sidebar-arrow').attr('data-shown', ''); $('#sidebar-arrow').attr('data-shown', '');
sessionStorage.setItem(STORAGE_TOGGLE_KEY, "un-toggled"); sessionStorage.setItem(STORAGE_TOGGLE_KEY, "un-toggled");
@ -18,7 +18,7 @@
$('#wrapper').css('paddingLeft', '0'); $('#wrapper').css('paddingLeft', '0');
$('.navbar-secondary').css({ $('.navbar-secondary').css({
'margin-left': '0', 'margin-left': '0',
'padding-left': '14px' 'padding-left': '0'
}); });
$('#sidebar-arrow').removeAttr('data-shown'); $('#sidebar-arrow').removeAttr('data-shown');
sessionStorage.setItem(STORAGE_TOGGLE_KEY, "toggled"); sessionStorage.setItem(STORAGE_TOGGLE_KEY, "toggled");

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

@ -40,7 +40,7 @@ $color-module-hover: $brand-primary;
} }
.projects-view-mode-switch { .projects-view-mode-switch {
margin: 10px; margin: 8px 10px 12px ;
} }
} }
@ -564,9 +564,9 @@ li.module-hover {
} }
.experiment-no-description { .experiment-no-description {
@include font-h3;
color: $color-alto; color: $color-alto;
display: block; display: block;
font-size: $font-size-large;
font-weight: bold; font-weight: bold;
margin-top: 10px; margin-top: 10px;
text-align: center; text-align: center;

1
app/assets/stylesheets/reports.scss
View file

@ -12,7 +12,6 @@
border-bottom: 1px solid $color-gainsboro; border-bottom: 1px solid $color-gainsboro;
border-left: 0; border-left: 0;
border-right: 0; border-right: 0;
border-top: 15px solid $color-concrete;
margin-bottom: 15px; margin-bottom: 15px;
min-width: 320px; min-width: 320px;
padding: 25px 20px; padding: 25px 20px;

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

@ -310,6 +310,7 @@ a[data-toggle="tooltip"] {
#secondary-menu { #secondary-menu {
background: $color-white; background: $color-white;
border-bottom: 1px solid $color-gainsboro; border-bottom: 1px solid $color-gainsboro;
padding-left: 29px;
padding-top: 15px; padding-top: 15px;
.open > a, .open > a,

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

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

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

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

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

@ -11,8 +11,8 @@
<% end %> <% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button> <button type="button" class="sci-btn secondary" 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> <button type="button" class="sci-btn" data-action="confirm"><%=t "experiments.canvas.edit.modal_edit_module.confirm" %></button>
</div> </div>
</div> </div>
</div> </div>

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

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

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

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

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

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

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

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

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

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

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

@ -9,8 +9,8 @@
</div> </div>
<div class="modal-body"></div> <div class="modal-body"></div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button> <button type="button" class="sci-btn secondary" 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> <button type="button" class="sci-btn" data-action="submit"><%= t("my_modules.protocols.copy_to_repository_modal.confirm") %></button>
</div> </div>
</div> </div>
</div> </div>

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

@ -9,8 +9,8 @@
</div> </div>
<div class="modal-body"></div> <div class="modal-body"></div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button> <button type="button" class="sci-btn secondary" 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> <button type="button" class="sci-btn" data-action="submit"><%= t("my_modules.protocols.load_from_repository_modal.load") %></button>
</div> </div>
</div> </div>
</div> </div>

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

@ -10,15 +10,15 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<% if can_manage_reports?(current_team) %> <% if can_manage_reports?(current_team) %>
<%= link_to '#', remote: true, class: 'btn btn-primary', id: 'new-report-btn' do %> <%= link_to '#', remote: true, class: 'sci-btn', id: 'new-report-btn' do %>
<span class="fas fa-plus" aria-hidden="true"></span> <span class="fas fa-plus" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.new" %></span> <span class="hidden-xs"><%=t "projects.reports.index.new" %></span>
<% end %> <% end %>
<%= link_to "", remote: true, class: "btn btn-default", id: "edit-report-btn" do %> <%= link_to "", remote: true, class: "sci-btn secondary", id: "edit-report-btn" do %>
<span class="fas fa-pencil-alt" aria-hidden="true"></span> <span class="fas fa-pencil-alt" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.edit" %></span> <span class="hidden-xs"><%=t "projects.reports.index.edit" %></span>
<% end %> <% end %>
<%= link_to "", remote: true, class: "btn btn-default", id: "delete-reports-btn" do %> <%= link_to "", remote: true, class: "sci-btn secondary", id: "delete-reports-btn" do %>
<span class="fas fa-times" aria-hidden="true"></span> <span class="fas fa-times" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.delete" %></span> <span class="hidden-xs"><%=t "projects.reports.index.delete" %></span>
<% end %> <% end %>
@ -97,9 +97,9 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button> <button type="button" class="sci-btn secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button id="new-report-reports-btn" <button id="new-report-reports-btn"
class="btn btn-success" class="sci-btn"
data-new-report-path="<%= @visible_projects.first.path if @visible_projects.first %>" data-new-report-path="<%= @visible_projects.first.path if @visible_projects.first %>"
<%= 'disabled' unless @visible_projects&.length > 0 %> <%= 'disabled' unless @visible_projects&.length > 0 %>
><%=t 'projects.reports.index.modal_new.create' %></button> ><%=t 'projects.reports.index.modal_new.create' %></button>

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

@ -50,8 +50,8 @@
</div> </div>
<div class="modal-body"></div> <div class="modal-body"></div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button> <button type="button" class="sci-btn secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="add" class="btn btn-success"><%=t "projects.reports.elements.modals.add" %></button> <button type="button" data-action="add" class="sci-btn"><%=t "projects.reports.elements.modals.add" %></button>
</div> </div>
</div> </div>
</div> </div>
@ -67,8 +67,8 @@
</div> </div>
<div class="modal-body"></div> <div class="modal-body"></div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button> <button type="button" class="sci-btn secondary" 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> <button type="button" data-action="save" class="sci-btn"><%=t "projects.reports.elements.modals.save_report.save" %></button>
</div> </div>
</div> </div>
</div> </div>

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

@ -2,7 +2,7 @@
<div class="center-block" id="report-menu"> <div class="center-block" id="report-menu">
<div class="dropdown" id="sort-report"> <div class="dropdown" id="sort-report">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="sci-btn secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="fas fa-sort visible-xs-inline"></span> <span class="fas fa-sort visible-xs-inline"></span>
<span class="hidden-xs"><%= t'projects.reports.new.nav_sort_by' %></span> <span class="hidden-xs"><%= t'projects.reports.new.nav_sort_by' %></span>
<span class="caret"></span> <span class="caret"></span>
@ -13,14 +13,14 @@
</ul> </ul>
</div> </div>
<%= link_to "", class: "btn btn-default", remote: true, id: "print-report" do %> <%= link_to "", class: "sci-btn secondary", remote: true, id: "print-report" do %>
<span class="fas fa-print"></span> <span class="fas fa-print"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_print" %></span> <span class="hidden-xs"><%=t "projects.reports.new.nav_print" %></span>
<% end %> <% end %>
<div class="dropdown" id="download-report"> <div class="dropdown" id="download-report">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="sci-btn secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="fas fa-download"></span> <span class="fas fa-download"></span>
<span class="hidden-xs"><%= t("projects.reports.new.nav_download") %><span> <span class="hidden-xs"><%= t("projects.reports.new.nav_download") %><span>
<span class="caret"></span> <span class="caret"></span>
@ -33,17 +33,17 @@
<button <button
onclick="$('#savePDFtoInventory').modal('show')" onclick="$('#savePDFtoInventory').modal('show')"
class="btn btn-default"> class="sci-btn secondary">
<span class="fas fa-save"> <span class="fas fa-save">
</span> </span>
<%=t 'projects.reports.new.save_PDF_to_inventory'%> <%=t 'projects.reports.new.save_PDF_to_inventory'%>
</button> </button>
<div class="pull-right"> <div class="pull-right">
<%= link_to reports_path, data: { no_turbolink: false }, id: "cancel-report-link", class: "btn btn-default" do %> <%= link_to reports_path, data: { no_turbolink: false }, id: "cancel-report-link", class: "sci-btn secondary" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_close" %></span> <span class="hidden-xs"><%=t "projects.reports.new.nav_close" %></span>
<% end %> <% end %>
<%= link_to "", class: "btn btn-success", remote: true, id: "save-report-link" do %> <%= link_to "", class: "sci-btn", remote: true, id: "save-report-link" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_save" %></span> <span class="hidden-xs"><%=t "projects.reports.new.nav_save" %></span>
<% end %> <% end %>
</div> </div>

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

@ -41,12 +41,12 @@
<div class="save-PDF-to-inventory-alerts" id="save-PDF-to-inventory-warnings"></div> <div class="save-PDF-to-inventory-alerts" id="save-PDF-to-inventory-warnings"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t 'general.cancel' %></button> <button type="button" class="sci-btn secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
<% if @available_repositories && @available_repositories.length > 0 %> <% if @available_repositories && @available_repositories.length > 0 %>
<button <button
id="savePDFtoInventorySubmit" id="savePDFtoInventorySubmit"
type="button" type="button"
class="btn btn-primary" class="sci-btn"
disabled disabled
><%=t 'general.save' %></button> ><%=t 'general.save' %></button>
<% end %> <% end %>

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

@ -8,7 +8,7 @@
<div class="checkbox-tree"> <div class="checkbox-tree">
<ul> <ul>
<li> <li>
<%= form.check_box :experiment_all, label: experiment.name %> <%= form.custom_check_box :experiment_all, label: experiment.name %>
<ul> <ul>
<% experiment.my_module_groups.each do |my_module_group| %> <% experiment.my_module_groups.each do |my_module_group| %>
@ -24,7 +24,7 @@
<!-- Tasks without groups --> <!-- Tasks without groups -->
<% experiment.my_modules.without_group.each do |my_module| %> <% experiment.my_modules.without_group.each do |my_module| %>
<li> <li>
<%= form.check_box "modules[#{my_module.id}]", label: my_module.name %> <%= form.custom_check_box "modules[#{my_module.id}]", label: my_module.name %>
</li> </li>
<% end %> <% end %>

14
app/views/shared/_secondary_navigation.html.erb
View file

@ -43,15 +43,11 @@
<li> <li>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li> <li>
<div class="btn-group projects-view-mode-switch" data-toggle="buttons"> <div class="projects-view-mode-switch sci-toggles-group" data-toggle="buttons">
<a class="btn btn-toggle active" href="#projects-cards-view" data-toggle="tab" data-mode="cards"> <input type="radio" name="projects-view-mode-selector" value="cards" class="sci-toggle-item" checked>
<input type="radio" name="projects-view-mode-selector" value="cards"> <a href="#projects-cards-view" data-toggle="tab" data-mode="cards" class="sci-toggle-item-label"><i class="fas fa-th-large"></i></a>
<i class="fas fa-th-large"></i> <input type="radio" name="projects-view-mode-selector" class="sci-toggle-item">
</a> <a class="sci-toggle-item-label" href="#projects-table-view" data-toggle="tab" data-mode="table"><i class="fas fa-th-list"></i></a>
<a class="btn btn-toggle" href="#projects-table-view" data-toggle="tab" data-mode="table">
<input type="radio" name="projects-view-mode-selector" value="table">
<i class="fas fa-th-list"></i>
</a>
</div> </div>
</li> </li>
</ul> </ul>