From b6c4f724db10791fbf9a247b95bd76f5157ef54a Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Wed, 6 Jun 2018 16:10:55 +0200 Subject: [PATCH 1/9] Update text when no experiments are found for moving tasks --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 8d579a80c..af2c0daec 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -773,11 +773,11 @@ en: modal_move_module: title: "Move task to experiment" confirm: "Move" - no_experiments: "There are no other experiments." + no_experiments: "No experiments to move this task to." modal_move_module_group: title: "Move workflow to experiment" confirm: "Move" - no_experiments: "There are no other experiments." + no_experiments: "No experiments to move this workflow to." modal_delete_module: title: "Archive task" confirm: "Archive" From e0a3b5a941d911b5edc88f8cb3941c90c1adff64 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Wed, 6 Jun 2018 16:29:07 +0200 Subject: [PATCH 2/9] Fix Save PDF to repository modal window --- .../new/_save_PDF_to_inventory_modal.html.erb | 17 ++++++++++------- config/locales/en.yml | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/views/reports/new/_save_PDF_to_inventory_modal.html.erb b/app/views/reports/new/_save_PDF_to_inventory_modal.html.erb index 678eb49f2..a9e8c264b 100644 --- a/app/views/reports/new/_save_PDF_to_inventory_modal.html.erb +++ b/app/views/reports/new/_save_PDF_to_inventory_modal.html.erb @@ -35,18 +35,21 @@ disabled> <% else %> -

<%=t 'projects.reports.new.save_PDF_to_inventory_modal.no_inventories' %>

+
+

<%=t 'projects.reports.new.save_PDF_to_inventory_modal.no_inventories' %>

<% end %>
- + <% if @available_repositories && @available_repositories.length > 0 %> + + <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index af2c0daec..50bb4f233 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -330,7 +330,7 @@ en: inventory: "Select inventory:" inventory_column: "Select inventory column:" inventory_item: "Select inventory item:" - no_inventories: "No inventories available!" + no_inventories: "No inventories to save this PDF to." success_flash: "Report successfully saved to Inventory item." asset_present_warning_html: "The selected cell already contains a file. If you would like to replace the file click Save. Replacing the file will have the following consequences: " no_items: "Selected Inventory does not contain any items yet. Add the first item" From ff485cb75d9ff4176cc9fddf9875be7758514e59 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Wed, 6 Jun 2018 16:38:04 +0200 Subject: [PATCH 3/9] Update wording on 'save protocol to protocol repository' modal --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 50bb4f233..638800bba 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -631,14 +631,14 @@ en: import_to_linked_task_rep: "Are you sure you wish to load protocol from repository? This action will overwrite the current protocol in the task and unlink it from repository. The current protocol will remain unchanged in repository." load: "Load" copy_to_repository_modal: - title: "Copy protocol to repository" + title: "Copy to protocol repository" name_label: "Repository protocol name" name_placeholder: "My protocol" type_label: "Copy to" type_public: "Team protocols" type_private: "My protocols" type_text: "You can copy the protocol to protocols repository visible to all team members, or to your protocols repository." - link_label: "Link task to this repository protocol" + link_label: "Link task to this protocol repository" link_text: "Warning! This will unlink the currently linked protocol." error_400: "Due to unknown error, protocol could not be copied to repository." confirm: "Copy" From c07fa5adc25b32cefde9e5afc0aff8b03d4a7f43 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Wed, 6 Jun 2018 17:23:22 +0200 Subject: [PATCH 4/9] Update blank page for projects --- app/views/projects/index.html.erb | 196 ++++++++++++++------------ app/views/repositories/index.html.erb | 2 +- config/locales/en.yml | 5 + 3 files changed, 114 insertions(+), 89 deletions(-) diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index fda5efe5c..7e146aade 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -4,101 +4,121 @@ <%= render partial: "shared/sidebar" %> <%= render partial: "shared/secondary_navigation" %> -
- <% if can_create_projects?(current_team) %> - -
- - <% if can_create_experiments?(@project) %> - <%= link_to new_project_experiment_url(@project), - remote: true, - type: "button", - id: 'new-experiment', - class: "btn btn-primary pull-right" do %> - - <%=t 'experiments.new.create' %> - <% end %> - <% end %> @@ -68,4 +57,3 @@ <%= javascript_include_tag("eventPause-min") %> <%= javascript_include_tag("projects/canvas") %> -<%= javascript_include_tag("experiments/dropdown_actions") %> From b324a2dab37dbfed02c48c0f184132209efefc6c Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 7 Jun 2018 09:29:47 +0200 Subject: [PATCH 6/9] Restyle activities page --- app/assets/stylesheets/themes/scinote.scss | 35 +++---------------- app/views/activities/index.html.erb | 2 +- .../activities/_list_activities.html.erb | 2 +- config/initializers/constants.rb | 2 +- 4 files changed, 8 insertions(+), 33 deletions(-) diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 805e9820f..241622476 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -765,50 +765,25 @@ ul.double-line > li { ul.content-activities { li.activity-item { - border-radius: .25em; background-color: $color-white; - border: 1px solid $color-concrete; + border-bottom: 1px solid $color-concrete; + padding: 8px 0; .activity-item-date { min-width: 150px; display: table-cell; - vertical-align: middle; - border-top-left-radius: .25em; - border-bottom-left-radius: .25em; - border: 3px solid $color-alto; - background-color: $color-alto; - padding-left: 10px; - padding-right: 10px; + padding: 0 10px; vertical-align: top; + text-align: center; } .activity-item-text { display: table-cell; - padding: 3px 10px; + padding: 0 10px; text-align: justify; } } } -ul.content-module-activities { - - li.activity-item { - margin-bottom: 15px; - - .activity-item-date { - font-size: 1.2em; - background-color: $color-alto; - border-color: $color-alto; - padding-top: 5px; - padding-bottom: 5px; - } - .activity-item-text { - padding-top: 5px; - padding-bottom: 5px; - } - } - -} - .step { .panel-heading a[data-toggle] { color: inherit; diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 35788b9ef..6bf1386ee 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -3,7 +3,7 @@
-